From 513b35ea2f7f679585e34a490685327c449e574b Mon Sep 17 00:00:00 2001 From: Treeston Date: Wed, 3 Jul 2019 21:01:13 +0200 Subject: Entities/Unit: Properly unset engaged flag for creates that cannot have a threat list on combat exit. Fixes #23518. (cherry picked from commit f44539b64247ff626c53dc899c4ac3023bf9aa80) --- src/server/game/Combat/CombatManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Combat/CombatManager.cpp b/src/server/game/Combat/CombatManager.cpp index 67ebb233fa4..d6f7a55665b 100644 --- a/src/server/game/Combat/CombatManager.cpp +++ b/src/server/game/Combat/CombatManager.cpp @@ -343,7 +343,7 @@ bool CombatManager::UpdateOwnerCombatState() const { _owner->RemoveUnitFlag(UNIT_FLAG_IN_COMBAT); _owner->AtExitCombat(); - if (_owner->IsEngaged() && !(_owner->ToCreature() && _owner->ToCreature()->IsAIEnabled())) + if (_owner->IsEngaged() && !(_owner->ToCreature() && _owner->CanHaveThreatList() && _owner->ToCreature()->IsAIEnabled())) _owner->AtDisengage(); } -- cgit v1.2.3