diff options
| author | jackpoz <giacomopoz@gmail.com> | 2014-05-19 22:00:48 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2014-05-19 22:00:48 +0200 |
| commit | d36ecbf4a39ed4d1b434a2926609b1d0d7b3c645 (patch) | |
| tree | f663cba46b39cb0c152ba2feefee7b959c0f2f9e /src | |
| parent | 0166d9bf89b07295d65017eed1e48c42a521f5d6 (diff) | |
| parent | 9bad26fc889cd084c066b41188215b3475d125c4 (diff) | |
Merge pull request #12076 from Trisjdc/even_more_sai
Core/SAI: Clear UNIT_STATE_EVADE immediately if we're about to follow a target on EnterEvadeMode
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index e769b7c22a5..9a677971619 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -439,6 +439,9 @@ void SmartAI::EnterEvadeMode() { if (Unit* target = me->GetUnit(*me, mFollowGuid)) me->GetMotionMaster()->MoveFollow(target, mFollowDist, mFollowAngle); + + // evade is not cleared in MoveFollow, so we can't keep it + me->ClearUnitState(UNIT_STATE_EVADE); } else me->GetMotionMaster()->MoveTargetedHome(); |