From 8ff105ac46ecc7f02244437b1b40030c9d8e325a Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Sat, 15 Jul 2023 10:07:35 -0700
Subject: [PATCH] fix: Fixes NPE in boomerang (#1426)

---
 Projects/UOContent/Items/Weapons/Ranged/BaseRanged.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Projects/UOContent/Items/Weapons/Ranged/BaseRanged.cs b/Projects/UOContent/Items/Weapons/Ranged/BaseRanged.cs
index b595448cc..a76eac33d 100644
--- a/Projects/UOContent/Items/Weapons/Ranged/BaseRanged.cs
+++ b/Projects/UOContent/Items/Weapons/Ranged/BaseRanged.cs
@@ -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),