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

fix: Fixes NPE in boomerang (#1426)

Browse source
This commit is contained in:
Kamron Batman 2023-07-15 10:07:35 -07:00 • committed by GitHub
parent 3825b16132
commit 8ff105ac46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Projects/UOContent/Items/Weapons/Ranged/BaseRanged.cs
View file

@ -94,10 +94,11 @@ namespace Server.Items
public override void OnHit(Mobile attacker, Mobile defender, double damageBonus = 1)
{
if (attacker.Player && !defender.Player && (defender.Body.IsAnimal || defender.Body.IsMonster) &&
var ammo = Ammo;
if (ammo != null && attacker.Player && !defender.Player && (defender.Body.IsAnimal || defender.Body.IsMonster) &&
Utility.RandomDouble() < 0.4)
{
defender.AddToBackpack(Ammo);
defender.AddToBackpack(ammo);
}
if (Core.ML && _velocity > 0)
@ -154,7 +155,7 @@ namespace Server.Items
}
else
{
Ammo.MoveToWorld(
Ammo?.MoveToWorld(
new Point3D(
defender.X + Utility.RandomMinMax(-1, 1),
defender.Y + Utility.RandomMinMax(-1, 1),