Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit f44539b642)
This commit is contained in:
Treeston
2019-07-03 21:01:13 +02:00
committed by Shauren
parent e0f3255f90
commit 513b35ea2f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Combat/CombatManager.cpp
View File

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