Entities/Unit: Properly unset engaged flag for creates that cannot have a threat list on combat exit. Fixes #23518.

This commit is contained in:
Treeston
2019-07-03 21:01:13 +02:00
parent a0a64b10b5
commit f44539b642

View File

@@ -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();
}