diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2019-07-03 21:01:13 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2019-07-03 21:01:29 +0200 |
| commit | f44539b64247ff626c53dc899c4ac3023bf9aa80 (patch) | |
| tree | 22df12883bae7dde7324a93e87db5d404aba1cc4 | |
| parent | a0a64b10b53e74c0cfaa518f196150c622e75bd2 (diff) | |
Entities/Unit: Properly unset engaged flag for creates that cannot have a threat list on combat exit. Fixes #23518.
| -rw-r--r-- | src/server/game/Combat/CombatManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Combat/CombatManager.cpp b/src/server/game/Combat/CombatManager.cpp index 9e5a8f5fb02..bd2f1f5b7ac 100644 --- a/src/server/game/Combat/CombatManager.cpp +++ b/src/server/game/Combat/CombatManager.cpp @@ -344,7 +344,7 @@ bool CombatManager::UpdateOwnerCombatState() const { _owner->RemoveFlag(UNIT_FIELD_FLAGS, 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(); } |