diff options
| author | Shauren <shauren.trinity@gmail.com> | 2013-07-13 15:26:10 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2013-07-13 15:26:10 +0200 |
| commit | 330dd624b6f979df9bae087a7fc2e55fdc9ee360 (patch) | |
| tree | e548e29b240291b20a2a02bd95f7d09ad0bbdbcb /src | |
| parent | 4aad735af95e9304b0fd0a394abf32198afb28a7 (diff) | |
Core/Movement: Do not remove movement flags that have special opcodes associated with them on teleport
Closes #10162
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 859b752acc7..a5c349984cf 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2130,7 +2130,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati ExitVehicle(); // reset movement flags at teleport, because player will continue move with these flags after teleport - SetUnitMovementFlags(0); + SetUnitMovementFlags(GetUnitMovementFlags() & MOVEMENTFLAG_MASK_HAS_PLAYER_STATUS_OPCODE); DisableSpline(); if (m_transport) diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 5474e336498..8a1eb78250b 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -735,8 +735,13 @@ enum MovementFlags /// @todo if needed: add more flags to this masks that are exclusive to players MOVEMENTFLAG_MASK_PLAYER_ONLY = - MOVEMENTFLAG_FLYING + MOVEMENTFLAG_FLYING, + + /// Movement flags that have change status opcodes associated for players + MOVEMENTFLAG_MASK_HAS_PLAYER_STATUS_OPCODE = MOVEMENTFLAG_DISABLE_GRAVITY | MOVEMENTFLAG_ROOT | + MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_WATERWALKING | MOVEMENTFLAG_FALLING_SLOW | MOVEMENTFLAG_HOVER }; + enum MovementFlags2 { MOVEMENTFLAG2_NONE = 0x00000000, |