From 1158f267df22c0782fb5f20f7de31f5643ac0b58 Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 23 Jun 2019 23:31:51 +0200 Subject: Combat/Threat: Split ThreatManager::NotifyDisengaged off from ThreatManager::ClearAllThreat. NotifyDisengaged signifies intent to clear the engagement flag, and should only be called from AI. Fixes #23490. --- src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp | 2 +- src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/game/AI/ScriptedAI') diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 3f5ff9a74ea..37dec1a6fe8 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -96,8 +96,8 @@ void EscortAI::ReturnToLastPoint() void EscortAI::EnterEvadeMode(EvadeReason /*why*/) { me->RemoveAllAuras(); - me->GetThreatManager().ClearAllThreat(); me->CombatStop(true); + me->GetThreatManager().NotifyDisengaged(); me->SetLootRecipient(nullptr); if (HasEscortState(STATE_ESCORT_ESCORTING)) diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index 40ebf4ee44d..04c6f0a3376 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -107,8 +107,8 @@ void FollowerAI::EnterEvadeMode(EvadeReason /*why*/) return; me->RemoveAllAuras(); - me->GetThreatManager().ClearAllThreat(); me->CombatStop(true); + me->GetThreatManager().NotifyDisengaged(); me->SetLootRecipient(nullptr); me->SetCannotReachTarget(false); me->DoNotReacquireTarget(); -- cgit v1.2.3