From 5a79b3f38557e490bee2e947e30ac20a99c831e8 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 14 Mar 2023 02:14:00 -0400 Subject: [PATCH] Core/Scripts: Make CreatureAI::DoZoneInCombat overload accepting a different creature static Port From (https://github.com/TrinityCore/TrinityCore/commit/080bf4c5650d54694819f6aaf7a12f3cbc623ef4) --- Source/Game/AI/CoreAI/CreatureAI.cs | 7 +++---- Source/Game/AI/ScriptedAI/ScriptedAI.cs | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Game/AI/CoreAI/CreatureAI.cs b/Source/Game/AI/CoreAI/CreatureAI.cs index c1d6996e7..1c2a900c9 100644 --- a/Source/Game/AI/CoreAI/CreatureAI.cs +++ b/Source/Game/AI/CoreAI/CreatureAI.cs @@ -55,11 +55,10 @@ namespace Game.AI base.OnCharmed(isNew); } - public void DoZoneInCombat(Creature creature = null) - { - if (!creature) - creature = me; + public void DoZoneInCombat() { DoZoneInCombat(me); } + public static void DoZoneInCombat(Creature creature) + { Map map = creature.GetMap(); if (!map.IsDungeon()) // use IsDungeon instead of Instanceable, in case Battlegrounds will be instantiated { diff --git a/Source/Game/AI/ScriptedAI/ScriptedAI.cs b/Source/Game/AI/ScriptedAI/ScriptedAI.cs index 7d745422f..f763d06cd 100644 --- a/Source/Game/AI/ScriptedAI/ScriptedAI.cs +++ b/Source/Game/AI/ScriptedAI/ScriptedAI.cs @@ -771,7 +771,7 @@ namespace Game.AI Creature summon = ObjectAccessor.GetCreature(_me, id); if (summon && summon.IsAIEnabled() && (entry == 0 || summon.GetEntry() == entry)) { - summon.GetAI().DoZoneInCombat(null); + summon.GetAI().DoZoneInCombat(); } } }