From 85f24d047e5ca72b0dc3851036e732944b680d76 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Fri, 17 Dec 2021 19:37:23 -0500
Subject: [PATCH] Core/Player: Fix teleporting FlyPath dismounting the player

Port From (https://github.com/TrinityCore/TrinityCore/commit/2d7ec53330bda17704cf46a88785f40b95ce3bfb)
---
 Source/Game/Entities/Player/Player.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs
index 888bc5b62..6890cebbc 100644
--- a/Source/Game/Entities/Player/Player.cs
+++ b/Source/Game/Entities/Player/Player.cs
@@ -1661,7 +1661,8 @@ namespace Game.Entities
             SetUnitMovementFlags(GetUnitMovementFlags() & MovementFlag.MaskHasPlayerStatusOpcode);
             m_movementInfo.ResetJump();
             DisableSpline();
-            GetMotionMaster().Clear();
+            if (!IsInFlight())
+                GetMotionMaster().Clear();
 
             Transport transport = GetTransport();
             if (transport)