From cab8975c27888ccbcfd6a615cea86dc7e9138375 Mon Sep 17 00:00:00 2001 From: 𝐍𝐆𝐏𝐎𝐍𝐆 Date: Mon, 24 Nov 2025 02:56:09 +0800 Subject: Core/Movement: Use `AdjustClientMovementTime` to remove redundant movement time calculations (#31492) --- src/server/game/Handlers/MovementHandler.cpp | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index 99d7c49e78b..a20c81137c8 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -530,16 +530,7 @@ void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recvData) } /* the client data has been verified. let's do the actual change now */ - 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; - } + movementInfo.time = AdjustClientMovementTime(movementInfo.time); mover->m_movementInfo = movementInfo; mover->UpdatePosition(movementInfo.pos); @@ -630,17 +621,7 @@ void WorldSession::HandleMoveKnockBackAck(WorldPacket& recvData) MovementInfo movementInfo; movementInfo.guid = guid; ReadMovementInfo(recvData, &movementInfo); - - 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; - } + movementInfo.time = AdjustClientMovementTime(movementInfo.time); mover->m_movementInfo = movementInfo; mover->UpdatePosition(movementInfo.pos); -- cgit v1.2.3