aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/server/game/DungeonFinding/LFGMgr.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 44569b2341c..957c18c8865 100755
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -1885,6 +1885,12 @@ void LFGMgr::TeleportPlayer(Player* plr, bool out, bool fromOpcode /*= false*/)
if (!plr->GetMap()->IsDungeon() && !plr->GetMap()->IsRaid())
plr->SetBattlegroundEntryPoint();
+ if (plr->isInFlight())
+ {
+ plr->GetMotionMaster()->MovementExpired();
+ plr->CleanupAfterTaxiFlight();
+ }
+
if (plr->TeleportTo(mapid, x, y, z, orientation))
plr->RemoveAurasByType(SPELL_AURA_MOUNTED);
else