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

16
Scripts/Items/Weapons/Ranged/BaseRanged.cs
View file

@ -69,15 +69,13 @@ namespace Server.Items
{
canSwing = !attacker.Paralyzed && !attacker.Frozen;
if (canSwing) canSwing = !(attacker.Spell is Spell sp) || !sp.IsCasting || !sp.BlocksMovement;
if (canSwing)
canSwing = !(attacker.Spell is Spell sp) || !sp.IsCasting || !sp.BlocksMovement;
}
#region Dueling
if (attacker is PlayerMobile pm)
if (pm.DuelContext != null && !pm.DuelContext.CheckItemEquip(attacker, this))
canSwing = false;
if ((attacker as PlayerMobile)?.DuelContext?.CheckItemEquip(attacker, this) == false)
canSwing = false;
#endregion
if (canSwing && attacker.HarmfulCheck(defender))
@ -175,9 +173,9 @@ namespace Server.Items
if (quiver == null || Utility.Random(100) >= quiver.LowerAmmoCost)
{
// consume ammo
if (quiver != null && quiver.ConsumeTotal(AmmoType, 1))
if (quiver?.ConsumeTotal(AmmoType) == true)
quiver.InvalidateWeight();
else if (pack == null || !pack.ConsumeTotal(AmmoType, 1))
else if (pack?.ConsumeTotal(AmmoType) != true)
return false;
}
else if (quiver.FindItemByType(AmmoType) == null && pack?.FindItemByType(AmmoType) == null)
@ -237,4 +235,4 @@ namespace Server.Items
}
}
}
}
}