diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2019-07-31 13:17:32 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2019-07-31 13:17:32 +0200 |
| commit | 9c603ea87f09c47d52f093ccc73ee75c15eff6f5 (patch) | |
| tree | a35422aef113e2aeccc4026d9bcec027f23faa0d /src/server/game/Entities/Creature | |
| parent | 5378fc450061a8fe125429925c43b3de22aeaf2b (diff) | |
Core/Combat: Properly unset engagement flag on death.
Diffstat (limited to 'src/server/game/Entities/Creature')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index c617066b375..8c9e6538ce0 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -702,6 +702,9 @@ void Creature::Update(uint32 diff) if (m_deathState != CORPSE) break; + if (IsEngaged()) + Unit::AIUpdateTick(diff); + if (m_groupLootTimer && lootingGroupLowGUID) { if (m_groupLootTimer <= diff) @@ -788,8 +791,6 @@ void Creature::Update(uint32 diff) } } - - // do not allow the AI to be changed during update Unit::AIUpdateTick(diff); // creature can be dead after UpdateAI call @@ -3272,7 +3273,7 @@ void Creature::AtDisengage() Unit::AtDisengage(); ClearUnitState(UNIT_STATE_ATTACK_PLAYER); - if (HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TAPPED)) + if (IsAlive() && HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TAPPED)) SetUInt32Value(UNIT_DYNAMIC_FLAGS, GetCreatureTemplate()->dynamicflags); if (IsPet() || IsGuardian()) // update pets' speed for catchup OOC speed |