aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorccrs <ccrs@users.noreply.github.com>2019-06-24 14:32:59 +0200
committerccrs <ccrs@users.noreply.github.com>2019-06-24 14:32:59 +0200
commit337de2b61e9df6a8d8b3ff2d0076f35345c33907 (patch)
tree23d47944b52da1f773b0bcaf886cdc167b5cd47d /src
parent9817bb55a3d14c329594e06cf65e3632c78ea6ad (diff)
Core/Player: 72fc79a followup
safer approach, please report any returning issue
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 949607d550d..4fc2e0798d9 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1665,8 +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();
- if (!IsInFlight())
- GetMotionMaster()->Clear();
+ GetMotionMaster()->Remove(EFFECT_MOTION_TYPE);
if (Transport* transport = GetTransport())
{