From 5adc3d28a48a39bd1cff7d79443a9379124ebca3 Mon Sep 17 00:00:00 2001
From: Kandera <KanderaDev@gmail.com>
Date: Mon, 24 Sep 2012 12:08:25 -0400
Subject: Core/Player: fix teleporting while on vehicle. Closes #7812 thx
 joschiwald

---
 src/server/game/Entities/Player/Player.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index c498350c78c..68be167f919 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -2113,6 +2113,9 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
     else
         sLog->outDebug(LOG_FILTER_MAPS, "Player %s is being teleported to map %u", GetName(), mapid);
 
+    if (m_vehicle)
+        ExitVehicle();
+
     // reset movement flags at teleport, because player will continue move with these flags after teleport
     SetUnitMovementFlags(0);
     DisableSpline();
-- 
cgit v1.2.3