From 4747debed1c41b2be0482623da3a2857fdaaa560 Mon Sep 17 00:00:00 2001
From: ccrs <ccrs@users.noreply.github.com>
Date: Mon, 24 Jun 2019 14:32:59 +0200
Subject: Core/Player: 72fc79a followup

safer approach, please report any returning issue

(cherry picked from commit 337de2b61e9df6a8d8b3ff2d0076f35345c33907)
---
 src/server/game/Entities/Player/Player.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index ac3bbdf0228..3ad7c4efd5f 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1369,8 +1369,7 @@ 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();
-    if (!IsInFlight())
-        GetMotionMaster()->Clear();
+    GetMotionMaster()->Remove(EFFECT_MOTION_TYPE);
 
     if (Transport* transport = GetTransport())
     {
-- 
cgit v1.2.3