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

Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)

Browse source
This commit is contained in:
Kamron Batman 2019-03-11 14:29:59 -07:00 • committed by GitHub
parent e748af4430
commit 513e54f70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1094 changed files with 15913 additions and 21892 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Scripts/Items/Weapons/Fists.cs
View file

@ -115,12 +115,12 @@ namespace Server.Items
{
Item toDisarm = defender.FindItemOnLayer(Layer.OneHanded);
if (toDisarm == null || !toDisarm.Movable)
if (toDisarm?.Movable == false)
toDisarm = defender.FindItemOnLayer(Layer.TwoHanded);
Container pack = defender.Backpack;
if (pack == null || toDisarm == null || !toDisarm.Movable)
if (pack == null || toDisarm?.Movable == false)
{
attacker.SendLocalizedMessage(1004001); // You cannot disarm your opponent.
}
@ -213,10 +213,7 @@ namespace Server.Items
{
Item item = m.FindItemOnLayer(Layer.OneHanded);
if (item != null && !(item is Spellbook))
return false;
return m.FindItemOnLayer(Layer.TwoHanded) == null;
return (item == null || item is Spellbook) && m.FindItemOnLayer(Layer.TwoHanded) == null;
}
private static void EventSink_DisarmRequest(DisarmRequestEventArgs e)
@ -313,4 +310,4 @@ namespace Server.Items
}
}
}
}
}