From 9499b4d4b685d8f60c7c7519a9a4ff67ba62e805 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:31:42 -0700 Subject: [PATCH 1/2] fix: Fixes OrcBrute spawn orclish lord ability --- .../Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs index 62387a71a9..c04e70b57e 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs @@ -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); } } } From 76aa91adf5872c6cb9f6ebc35a513ab000041810 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:50:25 -0700 Subject: [PATCH 2/2] fix: Fixes negative acts from explosion spell. Fixes Orc Brute ability --- .../UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs | 2 +- Projects/UOContent/Spells/Sixth/Explosion.cs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs index c04e70b57e..45541153c6 100644 --- 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; } diff --git a/Projects/UOContent/Spells/Sixth/Explosion.cs b/Projects/UOContent/Spells/Sixth/Explosion.cs index 687d2a7f44..f6f49ce0ea 100644 --- 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;