diff options
Diffstat (limited to 'src/server/game/Entities/Player')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 16 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 3 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index e628768cb7e..4e0f3caf8e5 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -284,8 +284,8 @@ Player::Player(WorldSession* session) : Unit(true), m_sceneMgr(this) // Player summoning m_summon_expire = 0; - m_mover = this; - m_movedPlayer = this; + m_unitMovedByMe = this; + m_playerMovingMe = this; m_seer = this; m_homebindMapId = 0; @@ -22811,7 +22811,7 @@ bool Player::IsNeverVisible() const bool Player::CanAlwaysSee(WorldObject const* obj) const { // Always can see self - if (m_mover == obj) + if (m_unitMovedByMe == obj) return true; ObjectGuid guid = GetGuidValue(PLAYER_FARSIGHT); @@ -24533,9 +24533,9 @@ void Player::SetClientControl(Unit* target, bool allowMove) void Player::SetMover(Unit* target) { - m_mover->m_movedPlayer = nullptr; - m_mover = target; - m_mover->m_movedPlayer = this; + m_unitMovedByMe->m_playerMovingMe = nullptr; + m_unitMovedByMe = target; + m_unitMovedByMe->m_playerMovingMe = this; WorldPackets::Movement::MoveSetActiveMover packet; packet.MoverGUID = target->GetGUID(); @@ -27033,8 +27033,8 @@ void Player::ValidateMovementInfo(MovementInfo* mi) */ REMOVE_VIOLATING_FLAGS(mi->HasMovementFlag(MOVEMENTFLAG_FLYING | MOVEMENTFLAG_CAN_FLY) && GetSession()->GetSecurity() == SEC_PLAYER && - !m_mover->HasAuraType(SPELL_AURA_FLY) && - !m_mover->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED), + !m_unitMovedByMe->HasAuraType(SPELL_AURA_FLY) && + !m_unitMovedByMe->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED), MOVEMENTFLAG_FLYING | MOVEMENTFLAG_CAN_FLY); REMOVE_VIOLATING_FLAGS(mi->HasMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY | MOVEMENTFLAG_CAN_FLY) && mi->HasMovementFlag(MOVEMENTFLAG_FALLING), diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 1c0c02808da..60361dd319b 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2286,7 +2286,8 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> /*** VARIOUS SYSTEMS ***/ /*********************************************************/ void UpdateFallInformationIfNeed(MovementInfo const& minfo, uint16 opcode); - Unit* m_mover; + // only changed for direct client control (possess, vehicle etc.), not stuff you control using pet commands + Unit* m_unitMovedByMe; WorldObject* m_seer; void SetFallInformation(uint32 time, float z); void HandleFall(MovementInfo const& movementInfo); |