aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchesD <majklprofik@seznam.cz>2015-06-11 10:57:10 +0200
committerDDuarte <dnpd.dd@gmail.com>2015-06-26 03:23:59 +0100
commitc6d3b0f2505e2bfaed1bd2af81d22640d99cea6e (patch)
tree9b169ed719d3b402aca2b8bd4eeff794fe7b5fa4
parent3c7eee915bb077ef792f0db535e5c37546988e96 (diff)
Merge pull request #14838 from Rushor/stop
Scripts/SmartScripts: Clear Movement on Death (cherry picked from commit f166dc3cab3f5325984c9f0fcf9ed1406ae6eae6)
-rw-r--r--src/server/game/AI/SmartScripts/SmartAI.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index 74d9e5b4a9c..c66762e64a1 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -585,7 +585,11 @@ void SmartAI::JustDied(Unit* killer)
{
GetScript()->ProcessEventsFor(SMART_EVENT_DEATH, killer);
if (HasEscortState(SMART_ESCORT_ESCORTING))
+ {
EndPath(true);
+ me->StopMoving();//force stop
+ me->GetMotionMaster()->MoveIdle();
+ }
}
void SmartAI::KilledUnit(Unit* victim)