diff options
| author | jackpoz <giacomopoz@gmail.com> | 2019-06-15 17:45:33 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-11 14:12:53 +0100 |
| commit | 2d7ec53330bda17704cf46a88785f40b95ce3bfb (patch) | |
| tree | f598896804c124b4c0ac17897531c9034de7e37b /src | |
| parent | ef4d4e3d98eeb1edb2e0eb5dc92ba40aea9996f7 (diff) | |
Core/Player: Fix teleporting FlyPath dismounting the player
Issue added in 72fc79a9e63d77754699a3da90d81219b2defb0d
(cherry picked from commit 4019cae375838e3bc653936fb9705d8df57ca571)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 8c3f0e786c3..402b5dbea10 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -1369,7 +1369,8 @@ 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 (!IsInFlight()) + GetMotionMaster()->Clear(); if (Transport* transport = GetTransport()) { |