fix: Fixes negative acts from explosion spell. Fixes Orc Brute ability (

#1974)
modernuo · Oct 16, 2024 · 9f985b0 · 9f985b0
1 parent 26c7f5c
commit 9f985b0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs
@@ -102,7 +102,7 @@ public void SpawnOrcLord(Mobile target)
         {
             var map = target.Map;
 
-            if (map == null)
+            if (map == null || map == Map.Internal)
             {
                 return;
             }
@@ -112,14 +112,20 @@ public void SpawnOrcLord(Mobile target)
             {
                 if (++count == 10)
                 {
-                    BaseCreature orc = new SpawnedOrcishLord { Team = Team };
-
-                    // This MoveToWorld is safe since we return after executing and do not keep looping.
-                    orc.MoveToWorld(map.GetRandomNearbyLocation(target.Location), map);
-                    orc.Combatant = target;
                     return;
                 }
             }
+
+            var location = map.GetRandomNearbyLocation(target.Location);
+            var orc = new SpawnedOrcishLord
+            {
+                Team = Team,
+                Home = location,
+                RangeHome = 10,
+                Combatant = target
+            };
+
+            orc.MoveToWorld(location, map);
         }
     }
 }
diff --git a/Projects/UOContent/Spells/Sixth/Explosion.cs b/Projects/UOContent/Spells/Sixth/Explosion.cs
@@ -68,6 +68,11 @@ public InternalTimer(MagerySpell spell, Mobile attacker, Mobile defender, Mobile
 
             protected override void OnTick()
             {
+                if (_defender.Deleted || !_defender.Alive)
+                {
+                    return;
+                }
+
                 if (_attacker.HarmfulCheck(_defender))
                 {
                     double damage;