From 72fc79a9e63d77754699a3da90d81219b2defb0d Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Sun, 9 Jun 2019 16:25:00 +0200
Subject: Core/Player: Remove all Motion Masters when teleporting

Fix #22859
---
 src/server/game/Entities/Player/Player.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/server')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index c0ed0408890..6ac2dbc0ad9 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1665,6 +1665,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
     // reset movement flags at teleport, because player will continue move with these flags after teleport
     SetUnitMovementFlags(GetUnitMovementFlags() & MOVEMENTFLAG_MASK_HAS_PLAYER_STATUS_OPCODE);
     DisableSpline();
+    GetMotionMaster()->Clear();
 
     if (Transport* transport = GetTransport())
     {
-- 
cgit v1.2.3