aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorccrs <ccrs@users.noreply.github.com>2019-06-24 14:32:59 +0200
committerShauren <shauren.trinity@gmail.com>2021-12-12 02:16:42 +0100
commit4747debed1c41b2be0482623da3a2857fdaaa560 (patch)
tree534be58c098eabaf03c4af4e170bd7f3c0bab640 /src
parenta4da12119eee127e1d5923e4489eaeeeec258aae (diff)
Core/Player: 72fc79a followup
safer approach, please report any returning issue (cherry picked from commit 337de2b61e9df6a8d8b3ff2d0076f35345c33907)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp3
1 files changed, 1 insertions, 2 deletions
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())
{