aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2019-06-09 16:25:00 +0200
committerShauren <shauren.trinity@gmail.com>2021-12-11 11:38:24 +0100
commitab3edebb5d824f7cb0d030daba168e2bb7900511 (patch)
treebac871ffdfabba80d3c1b7f12efc0a0bd05cf902 /src
parentd01906b76cba4257b23394539da92315b06cb70d (diff)
Core/Player: Remove all Motion Masters when teleporting
Fix #22859 (cherry picked from commit 72fc79a9e63d77754699a3da90d81219b2defb0d)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index efe991c3d0c..413bea41cac 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1369,6 +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();
+ GetMotionMaster()->Clear();
if (Transport* transport = GetTransport())
{