From 2d7ec53330bda17704cf46a88785f40b95ce3bfb Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Sat, 15 Jun 2019 17:45:33 +0200
Subject: Core/Player: Fix teleporting FlyPath dismounting the player

Issue added in 72fc79a9e63d77754699a3da90d81219b2defb0d

(cherry picked from commit 4019cae375838e3bc653936fb9705d8df57ca571)
---
 src/server/game/Entities/Player/Player.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 8c3f0e786c3..402b5dbea10 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1369,7 +1369,8 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
     SetUnitMovementFlags(GetUnitMovementFlags() & MOVEMENTFLAG_MASK_HAS_PLAYER_STATUS_OPCODE);
     m_movementInfo.ResetJump();
     DisableSpline();
-    GetMotionMaster()->Clear();
+    if (!IsInFlight())
+        GetMotionMaster()->Clear();
 
     if (Transport* transport = GetTransport())
     {
-- 
cgit v1.2.3