warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code Cleanup & Fixes Warnings (#74)

Browse source
This commit is contained in:
Kamron Batman 2020-01-18 14:56:45 -08:00 • committed by GitHub
parent e11d1f3ad9
commit 57b14ad690
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
143 changed files with 2960 additions and 3427 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Projects/Scripts/Items/Deeds/CommodityDeed.cs
View file

@ -85,13 +85,9 @@ namespace Server.Items
if (Commodity != null)
{
string args;
if (Commodity.Name == null)
args =
$"#{(Commodity is ICommodity commodity ? commodity.DescriptionNumber : Commodity.LabelNumber)}\t{Commodity.Amount}";
else
args = $"{Commodity.Name}\t{Commodity.Amount}";
var args = Commodity.Name == null ?
$"#{(Commodity is ICommodity commodity ? commodity.DescriptionNumber : Commodity.LabelNumber)}\t{Commodity.Amount}" :
$"{Commodity.Name}\t{Commodity.Amount}";
list.Add(1060658, args); // ~1_val~: ~2_val~
}

5
Projects/Scripts/Items/Deeds/DragonBardingDeed.cs
View file

@ -64,10 +64,7 @@ namespace Server.Items
if (makersMark)
Crafter = from;
Type resourceType = typeRes;
if (resourceType == null)
resourceType = craftItem.Resources.GetAt(0).ItemType;
Type resourceType = typeRes ?? craftItem.Resources.GetAt(0).ItemType;
Resource = CraftResources.GetFromType(resourceType);