From e7ab9031ac411a84844832ab475dbb06981fc15b Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sat, 1 Jan 2022 17:58:34 -0500 Subject: [PATCH] Core/AI: No longer do strange things when told to enter evade mode while there's no need to do so, typically by terrible legacy code. Port From (https://github.com/TrinityCore/TrinityCore/commit/3269c4278933d65ef0df619a50cbd0b851cab4fc) --- Source/Game/AI/CoreAI/CreatureAI.cs | 8 ++------ Source/Game/Maps/ObjectGridLoader.cs | 4 ---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Source/Game/AI/CoreAI/CreatureAI.cs b/Source/Game/AI/CoreAI/CreatureAI.cs index 68bfed014..fdd916cc8 100644 --- a/Source/Game/AI/CoreAI/CreatureAI.cs +++ b/Source/Game/AI/CoreAI/CreatureAI.cs @@ -290,7 +290,7 @@ namespace Game.AI public bool _EnterEvadeMode(EvadeReason why = EvadeReason.Other) { - if (me.IsInEvadeMode()) + if (!IsEngaged()) return false; if (!me.IsAlive()) @@ -455,11 +455,7 @@ namespace Game.AI public virtual void JustEngagedWith(Unit who) { } // Called when the creature is killed - public virtual void JustDied(Unit killer) - { - if (IsEngaged()) - EngagementOver(); - } + public virtual void JustDied(Unit killer) { } // Called when the creature kills a unit public virtual void KilledUnit(Unit victim) { } diff --git a/Source/Game/Maps/ObjectGridLoader.cs b/Source/Game/Maps/ObjectGridLoader.cs index a66f84087..9e417f5d7 100644 --- a/Source/Game/Maps/ObjectGridLoader.cs +++ b/Source/Game/Maps/ObjectGridLoader.cs @@ -214,11 +214,7 @@ namespace Game.Maps creature.RemoveAllAreaTriggers(); if (creature.IsInCombat()) - { creature.CombatStop(); - if (creature.IsAIEnabled()) - creature.GetAI().EnterEvadeMode(); - } } } }