aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKandera <KanderaDev@gmail.com>2012-09-24 12:08:25 -0400
committerKandera <KanderaDev@gmail.com>2012-09-24 12:08:25 -0400
commit5adc3d28a48a39bd1cff7d79443a9379124ebca3 (patch)
treedc0f868c526554ecb7a624a51771a68544136967 /src
parentbec67b7acc826ba789fe06296ca4e532295ed77e (diff)
Core/Player: fix teleporting while on vehicle. Closes #7812 thx joschiwald
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Entities/Player/Player.cpp3
1 files changed, 3 insertions, 0 deletions
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();