From c6d3b0f2505e2bfaed1bd2af81d22640d99cea6e Mon Sep 17 00:00:00 2001
From: MitchesD <majklprofik@seznam.cz>
Date: Thu, 11 Jun 2015 10:57:10 +0200
Subject: Merge pull request #14838 from Rushor/stop

Scripts/SmartScripts: Clear Movement on Death
(cherry picked from commit f166dc3cab3f5325984c9f0fcf9ed1406ae6eae6)
---
 src/server/game/AI/SmartScripts/SmartAI.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/server')

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)
-- 
cgit v1.2.3