diff options
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index dbb69e78ce6..a35d588622f 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -743,6 +743,8 @@ void Creature::Update(uint32 diff) UpdateMovementCapabilities(); + GetThreatManager().Update(diff); + switch (m_deathState) { case JUST_RESPAWNED: @@ -829,7 +831,6 @@ void Creature::Update(uint32 diff) if (!IsAlive()) break; - GetThreatManager().Update(diff); if (_spellFocusInfo.Delay) { if (_spellFocusInfo.Delay <= diff) @@ -3595,6 +3596,8 @@ void Creature::AtEngage(Unit* target) { Unit::AtEngage(target); + GetThreatManager().ResetUpdateTimer(); + if (!HasFlag(CREATURE_STATIC_FLAG_2_ALLOW_MOUNTED_COMBAT)) Dismount(); |