From b1ded4bd98a61666fed8367ae8a16bab732cc327 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Wed, 22 Dec 2010 21:31:52 +0100
Subject: Core/Unit: Check if NPC is on a transport before sending StopMoving()
 -packet (normally shipped when trying to speak to moving NPCs) - fixes
 creatures falling off boats etc. Thanks to Socolin for hunting down and
 patching this annoying bug.

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/server')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 8da94c2d403..1d01d2d78bc 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -14481,8 +14481,9 @@ void Unit::StopMoving()
     //if (fabs(GetPositionZ() - z) < 2.0f)
     //    Relocate(GetPositionX(), GetPositionY(), z);
     //Relocate(GetPositionX(), GetPositionY(),GetPositionZ());
-
-    SendMonsterStop();
+    
+    if (!(GetUnitMovementFlags() & MOVEMENTFLAG_ONTRANSPORT))
+        SendMonsterStop();
 }
 
 void Unit::SendMovementFlagUpdate()
-- 
cgit v1.2.3