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

Fixes casting checks

Browse source
This commit is contained in:
Kamron Batman 2018-08-19 01:38:55 +08:00
parent 7ea00fbf4f
commit 03dd5f1926
431 changed files with 5616 additions and 6250 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Scripts/Commands/GenCategorization.cs
View file

@ -97,16 +97,12 @@ namespace Server.Commands
xml.WriteAttributeString( "type", cte.Type.ToString() );
object obj = cte.Object;
if ( obj is Item )
if ( cte.Object is Item item )
{
Item item = (Item)obj;
int itemID = item.ItemID;
if ( item is BaseAddon && ((BaseAddon)item).Components.Count == 1 )
itemID = ((AddonComponent)(((BaseAddon)item).Components[0])).ItemID;
if ( item is BaseAddon addon && addon.Components.Count == 1 )
itemID = addon.Components[0].ItemID;
if ( itemID > TileData.MaxItemValue )
itemID = 1;
@ -123,10 +119,8 @@ namespace Server.Commands
item.Delete();
}
else if ( obj is Mobile )
else if ( cte.Object is Mobile mob )
{
Mobile mob = (Mobile)obj;
int itemID = ShrinkTable.Lookup( mob, 1 );
xml.WriteAttributeString( "gfx", XmlConvert.ToString( itemID ) );
@ -251,15 +245,15 @@ namespace Server.Commands
{
string a = null, b = null;
if ( x is CategoryEntry )
a = ((CategoryEntry)x).Title;
else if ( x is CategoryTypeEntry )
a = ((CategoryTypeEntry)x).Type.Name;
if ( x is CategoryEntry entry )
a = entry.Title;
else if ( x is CategoryTypeEntry typeEntry )
a = typeEntry.Type.Name;
if ( y is CategoryEntry )
b = ((CategoryEntry)y).Title;
else if ( y is CategoryTypeEntry )
b = ((CategoryTypeEntry)y).Type.Name;
if ( y is CategoryEntry categoryEntry )
b = categoryEntry.Title;
else if ( y is CategoryTypeEntry typeEntry )
b = typeEntry.Type.Name;
if ( a == null && b == null )
return 0;
@ -423,4 +417,4 @@ namespace Server.Commands
return (CategoryLine[])list.ToArray( typeof( CategoryLine ) );
}
}
}
}