diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 9762c6434d..a24f97dcd3 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -76,6 +76,7 @@ #include "MotionMaster.h" #include "MovementStructures.h" #include "MovementPackets.h" +#include "MovementPacketSender.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -24788,6 +24789,9 @@ void Player::SetClientControl(Unit* target, bool allowMove) } GetGameClient()->SetMovedUnit(target, allowMove); + + if (allowMove) + SendDirectMessage(WorldPackets::Movement::MoveSetActiveMover(target->GetGUID()).Write()); } void Player::UpdateZoneDependentAuras(uint32 newZone) @@ -25869,6 +25873,26 @@ void Player::HandleFall(MovementInfo const& movementInfo) } } +bool Player::SetDisableGravity(bool disable, bool /*packetOnly = false*/, bool /*updateAnimationTier = true*/) +{ + if (disable == IsGravityDisabled()) + return false; + + MovementPacketSender::SendMovementFlagChangeToMover(this, MOVEMENTFLAG_DISABLE_GRAVITY, disable); + + return true; +} + +bool Player::SetCanFly(bool enable, bool /*packetOnly = false*/) +{ + if (enable == HasUnitMovementFlag(MOVEMENTFLAG_CAN_FLY)) + return false; + + MovementPacketSender::SendMovementFlagChangeToMover(this, MOVEMENTFLAG_CAN_FLY, enable); + + return true; +} + void Player::ResetAchievements() { m_achievementMgr->Reset(); diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 357db26329..2c0687a595 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2144,6 +2144,8 @@ class TC_GAME_API Player : public Unit, public GridObject WorldObject* m_seer; void SetFallInformation(uint32 time, float z); void HandleFall(MovementInfo const& movementInfo); + bool SetDisableGravity(bool disable, bool packetOnly = false, bool updateAnimationTier = true) override; + bool SetCanFly(bool enable, bool packetOnly = false) override; void SetClientControl(Unit* target, bool allowMove); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index ffc5934277..8143ab2c3c 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -15065,7 +15065,4 @@ void Unit::ProcessItemCast(PendingSpellCastRequest const& castRequest, SpellCast void Unit::SetGameClientMovingMe(GameClient* gameClientMovingMe) { _gameClientMovingMe = gameClientMovingMe; - - Player* mover = _gameClientMovingMe->GetBasePlayer(); - mover->SendDirectMessage(WorldPackets::Movement::MoveSetActiveMover(mover->GetGUID()).Write()); } diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 959be557a1..8b60513162 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1224,7 +1224,7 @@ class TC_GAME_API Unit : public WorldObject virtual bool SetDisableGravity(bool disable, bool packetOnly = false, bool updateAnimationTier = true); bool SetFall(bool enable); bool SetSwim(bool enable); - bool SetCanFly(bool enable, bool packetOnly = false); + virtual bool SetCanFly(bool enable, bool packetOnly = false); bool SetWaterWalking(bool enable, bool packetOnly = false); bool SetFeatherFall(bool enable, bool packetOnly = false); virtual bool SetHover(bool enable, bool packetOnly = false, bool updateAnimationTier = true); diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index c6d557c1f2..0046d27c67 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -18,6 +18,7 @@ #include "Common.h" #include "WorldPacket.h" #include "WorldSession.h" +#include "ObjectAccessor.h" #include "Opcodes.h" #include "Log.h" #include "Corpse.h" @@ -581,10 +582,9 @@ void WorldSession::HandleMoveNotActiveMover(WorldPacket &recvData) TC_LOG_DEBUG("network", "WORLD: Recvd CMSG_MOVE_NOT_ACTIVE_MOVER"); MovementInfo movementInfo; - GetPlayer()->ReadMovementInfo(recvData, &movementInfo); + _player->ReadMovementInfo(recvData, &movementInfo); GameClient* client = GetGameClient(); - if (client->GetActivelyMovedUnit() == nullptr || client->GetActivelyMovedUnit()->GetGUID() != movementInfo.guid) { TC_LOG_DEBUG("entities.unit", "unset active mover FAILED for client of player %s. GUID %s.", _player->GetName().c_str(), movementInfo.guid.ToString().c_str()); @@ -698,16 +698,61 @@ void WorldSession::HandleMoveSetCanTransitionBetweenSwinAndFlyAck(WorldPacket& r void WorldSession::HandleMoveGravityDisableAck(WorldPacket& recvData) { - TC_LOG_DEBUG("network", "CMSG_MOVE_GRAVITY_DISABLE_ACK"); + TC_LOG_DEBUG("network", GetOpcodeNameForLogging(static_cast(recvData.GetOpcode())).c_str()); MovementInfo movementInfo; GetPlayer()->ReadMovementInfo(recvData, &movementInfo); -} -void WorldSession::HandleMoveGravityEnableAck(WorldPacket& recvData) -{ - TC_LOG_DEBUG("network", "CMSG_MOVE_GRAVITY_ENABLE_ACK"); - MovementInfo movementInfo; - GetPlayer()->ReadMovementInfo(recvData, &movementInfo); + GameClient* client = GetGameClient(); + if (!client->IsAllowedToMove(movementInfo.guid)) + return; + + Unit* mover = ObjectAccessor::GetUnit(*_player, movementInfo.guid); + + // verify that indeed the client is replying with the changes that were send to him + if (!mover->HasPendingMovementChange() || mover->PeakFirstPendingMovementChange().movementCounter > movementInfo.movementCounter) + { + TC_LOG_DEBUG("entities.unit", "Ignoring ACK. Bad or outdated movement data by Player %s", _player->GetName().c_str()); + return; + } + + bool disable = recvData.GetOpcode() == CMSG_MOVE_GRAVITY_DISABLE_ACK; + PlayerMovementPendingChange pendingChange = mover->PopPendingMovementChange(); + if (pendingChange.movementChangeType != MovementChangeType::GRAVITY_DISABLE || pendingChange.apply != disable) + { + TC_LOG_INFO("cheat", "WorldSession::HandleMoveSetCanFlyAckOpcode: Player %s from account id %u kicked for incorrect data returned in an ack", + _player->GetName().c_str(), _player->GetSession()->GetAccountId()); + _player->GetSession()->KickPlayer(); + return; + } + + int64 movementTime = (int64)movementInfo.time + _timeSyncClockDelta; + if (_timeSyncClockDelta == 0 || movementTime < 0 || movementTime > 0xFFFFFFFF) + { + TC_LOG_WARN("misc", "The computed movement time using clockDelta is erronous. Using fallback instead"); + movementInfo.time = GameTime::GetGameTimeMS(); + } + else + { + movementInfo.time = (uint32)movementTime; + } + + mover->m_movementInfo = movementInfo; + mover->UpdatePosition(movementInfo.pos); + + if (disable) + { + mover->AddUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY); + mover->RemoveUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_SPLINE_ELEVATION); + mover->SetFall(false); + } + else + { + mover->RemoveUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY); + if (!mover->HasUnitMovementFlag(MOVEMENTFLAG_CAN_FLY)) + mover->SetFall(true); + } + + MovementPacketSender::SendMovementFlagChangeToObservers(mover); } void WorldSession::HandleSetCollisionHeightAck(WorldPacket& recvData) @@ -723,6 +768,57 @@ void WorldSession::HandleMoveSetCanFlyAckOpcode(WorldPacket& recvData) TC_LOG_DEBUG("network", "CMSG_MOVE_SET_CAN_FLY_ACK"); MovementInfo movementInfo; GetPlayer()->ReadMovementInfo(recvData, &movementInfo); + + GameClient* client = GetGameClient(); + if (!client->IsAllowedToMove(movementInfo.guid)) + return; + + Unit* mover = ObjectAccessor::GetUnit(*_player, movementInfo.guid); + + // verify that indeed the client is replying with the changes that were send to him + if (!mover->HasPendingMovementChange() || mover->PeakFirstPendingMovementChange().movementCounter > movementInfo.movementCounter) + { + TC_LOG_DEBUG("entities.unit", "Ignoring ACK. Bad or outdated movement data by Player %s", _player->GetName().c_str()); + return; + } + + PlayerMovementPendingChange pendingChange = mover->PopPendingMovementChange(); + if (pendingChange.movementChangeType != MovementChangeType::SET_CAN_FLY) + { + TC_LOG_INFO("cheat", "WorldSession::HandleMoveSetCanFlyAckOpcode: Player %s from account id %u kicked for incorrect data returned in an ack", + _player->GetName().c_str(), _player->GetSession()->GetAccountId()); + _player->GetSession()->KickPlayer(); + return; + } + + int64 movementTime = (int64)movementInfo.time + _timeSyncClockDelta; + if (_timeSyncClockDelta == 0 || movementTime < 0 || movementTime > 0xFFFFFFFF) + { + TC_LOG_WARN("misc", "The computed movement time using clockDelta is erronous. Using fallback instead"); + movementInfo.time = GameTime::GetGameTimeMS(); + } + else + { + movementInfo.time = (uint32)movementTime; + } + + mover->m_movementInfo = movementInfo; + mover->UpdatePosition(movementInfo.pos); + + if (pendingChange.apply) + { + mover->AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY); + mover->RemoveUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_SPLINE_ELEVATION); + mover->SetFall(false); + } + else + { + if (mover->IsFlying() && !mover->IsGravityDisabled()) + mover->SetFall(true); + mover->RemoveUnitMovementFlag(MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_MASK_MOVING_FLY); + } + + MovementPacketSender::SendMovementFlagChangeToObservers(mover); } void WorldSession::HandleMoveTimeSkippedOpcode(WorldPacket& recvData) { diff --git a/src/server/game/Movement/MovementPacketSender.cpp b/src/server/game/Movement/MovementPacketSender.cpp index 3451c4d051..c662bd83cf 100644 --- a/src/server/game/Movement/MovementPacketSender.cpp +++ b/src/server/game/Movement/MovementPacketSender.cpp @@ -56,6 +56,17 @@ MovementChangeType MovementPacketSender::GetChangeTypeByMoveType(UnitMoveType mo } } +MovementChangeType MovementPacketSender::GetChangeTypeByMovementFlag(MovementFlags mFlag) +{ + switch (mFlag) + { + case MOVEMENTFLAG_CAN_FLY: return MovementChangeType::SET_CAN_FLY; + case MOVEMENTFLAG_DISABLE_GRAVITY: return MovementChangeType::GRAVITY_DISABLE; + default: + ASSERT(false, "MovementPacketSender::SendSpeedChangeToMover Unsupported MovementFlags"); + } +} + void MovementPacketSender::SendSpeedChangeToMover(Unit* unit, UnitMoveType mtype, float newSpeedFlat) { GameClient* controller = unit->GetGameClientMovingMe(); @@ -112,3 +123,41 @@ void MovementPacketSender::SendSpeedChangeToAll(Unit* unit, UnitMoveType mtype, unit->SendMessageToSet(&data, true); } +void MovementPacketSender::SendMovementFlagChangeToMover(Unit* unit, MovementFlags mFlag, bool apply) +{ + GameClient* controller = unit->GetGameClientMovingMe(); + + ASSERT(controller); + + uint32 mCounter = unit->GetMovementCounterAndInc(); + PlayerMovementPendingChange pendingChange; + pendingChange.movementCounter = mCounter; + pendingChange.apply = apply; + pendingChange.movementChangeType = MovementPacketSender::GetChangeTypeByMovementFlag(mFlag); + unit->PushPendingMovementChange(pendingChange); + + OpcodeServer opcode; + switch (mFlag) + { + case MOVEMENTFLAG_CAN_FLY: opcode = apply ? SMSG_MOVE_SET_CAN_FLY : SMSG_MOVE_UNSET_CAN_FLY; break; + case MOVEMENTFLAG_DISABLE_GRAVITY: opcode = apply ? SMSG_MOVE_GRAVITY_DISABLE : SMSG_MOVE_GRAVITY_ENABLE; break; + default: + ASSERT(false, "MovementPacketSender::SendMovementFlagChangeToMover Unsupported MovementFlags"); + break; + } + + WorldPacket data(opcode); + unit->WriteMovementInfo(data, nullptr, &mCounter); + controller->SendDirectMessage(&data); +} + +void MovementPacketSender::SendMovementFlagChangeToObservers(Unit* unit) +{ + GameClient* controller = unit->GetGameClientMovingMe(); + + ASSERT(controller); + + WorldPacket data(SMSG_MOVE_UPDATE); + unit->WriteMovementInfo(data); + unit->SendMessageToSet(&data, controller->GetBasePlayer()); +} diff --git a/src/server/game/Movement/MovementPacketSender.h b/src/server/game/Movement/MovementPacketSender.h index 779f3bc9d2..06f558d6e6 100644 --- a/src/server/game/Movement/MovementPacketSender.h +++ b/src/server/game/Movement/MovementPacketSender.h @@ -115,15 +115,13 @@ class MovementPacketSender //static void SendKnockBackToObservers(Unit* unit, float vcos, float vsin, float speedXY, float speedZ); ///* movement flag change */ - //static void SendMovementFlagChangeToMover(Unit* unit, MovementFlags mFlag, bool apply); + static void SendMovementFlagChangeToMover(Unit* unit, MovementFlags mFlag, bool apply); //static void SendMovementFlagChangeToMover(Unit* unit, MovementFlags2 mFlag, bool apply); - //static void SendMovementFlagChangeToObservers(Unit* unit, MovementFlags mFlag, bool apply); - //static void SendMovementFlagChangeToObservers(Unit* unit, MovementFlags2 mFlag); - - //static void SendMovementFlagChangeToAll(Unit* unit, MovementFlags mFlag, bool apply); + static void SendMovementFlagChangeToObservers(Unit* unit); // utility method static MovementChangeType GetChangeTypeByMoveType(UnitMoveType moveType); + static MovementChangeType GetChangeTypeByMovementFlag(MovementFlags mFlag); private: static OpcodeServer const moveTypeToOpcode[MAX_MOVE_TYPE][3]; diff --git a/src/server/game/Server/Packets/MovementPackets.h b/src/server/game/Server/Packets/MovementPackets.h index 6df11d2ed7..5cf43d3313 100644 --- a/src/server/game/Server/Packets/MovementPackets.h +++ b/src/server/game/Server/Packets/MovementPackets.h @@ -252,7 +252,7 @@ namespace WorldPackets class MoveSetActiveMover final : public ServerPacket { public: - MoveSetActiveMover(ObjectGuid moverGuid) : ServerPacket(SMSG_FLIGHT_SPLINE_SYNC, 4 + 8), MoverGUID(moverGuid) { } + MoveSetActiveMover(ObjectGuid moverGuid) : ServerPacket(SMSG_MOVE_SET_ACTIVE_MOVER, 8), MoverGUID(moverGuid) { } WorldPacket const* Write() override; diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 408b04846b..5823a493cf 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -463,7 +463,7 @@ void OpcodeTable::Initialize() DEFINE_HANDLER(CMSG_MOVE_FORCE_TURN_RATE_CHANGE_ACK, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleForceSpeedChangeAck ); DEFINE_HANDLER(CMSG_MOVE_FORCE_WALK_SPEED_CHANGE_ACK, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleForceSpeedChangeAck ); DEFINE_HANDLER(CMSG_MOVE_GRAVITY_DISABLE_ACK, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMoveGravityDisableAck ); - DEFINE_HANDLER(CMSG_MOVE_GRAVITY_ENABLE_ACK, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMoveGravityEnableAck ); + DEFINE_HANDLER(CMSG_MOVE_GRAVITY_ENABLE_ACK, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMoveGravityDisableAck ); DEFINE_HANDLER(CMSG_MOVE_HOVER_ACK, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMoveHoverAck ); DEFINE_HANDLER(CMSG_MOVE_KNOCK_BACK_ACK, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMoveKnockBackAck ); DEFINE_HANDLER(CMSG_MOVE_NOT_ACTIVE_MOVER, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMoveNotActiveMover ); diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 7da49eac8d..0fc52940ff 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -695,7 +695,7 @@ class TC_GAME_API WorldSession void HandleMoveSetCanFlyAckOpcode(WorldPacket& recvData); void HandleMoveSetCanTransitionBetweenSwinAndFlyAck(WorldPacket& recvData); void HandleMoveGravityDisableAck(WorldPacket& recvData); - void HandleMoveGravityEnableAck(WorldPacket& recvData); + void HandleSetCollisionHeightAck(WorldPacket& recvData); void HandleMountSpecialAnimOpcode(WorldPacket& recvdata);