From f5911917b4ea1e97b0f22876dc8f35bbfa9833c9 Mon Sep 17 00:00:00 2001
From: Xanadu <none@none>
Date: Sun, 17 Oct 2010 03:09:01 +0200
Subject: Core/Vehicles: Mammoth mount vendors no longer jump off the mount
 when talked to.

--HG--
branch : trunk
---
 src/server/game/Server/Protocol/Handlers/ItemHandler.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
index ebf5c93816e..b9e675066e0 100755
--- a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
@@ -729,7 +729,8 @@ void WorldSession::SendListInventory(uint64 vendorguid)
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
 
     // Stop the npc if moving
-    pCreature->StopMoving();
+    if (pCreature->hasUnitState(UNIT_STAT_MOVING))
+        pCreature->StopMoving();
 
     VendorItemData const* vItems = pCreature->GetVendorItems();
     if (!vItems)
-- 
cgit v1.2.3