Core/Vehicle: Don't set players movementInfo on vehicle dismiss (#29744)

1 files changed, 6 insertions, 2 deletions

diff --git a/src/server/game/Handlers/VehicleHandler.cpp b/src/server/game/Handlers/VehicleHandler.cpp
index ac4472474b3..f6f0358f3ba 100644
--- a/src/server/game/Handlers/VehicleHandler.cpp
+++ b/src/server/game/Handlers/VehicleHandler.cpp
@@ -30,8 +30,12 @@ void WorldSession::HandleMoveDismissVehicle(WorldPackets::Vehicle::MoveDismissVe
     if (vehicleGUID.IsEmpty())
         return;
 
-    _player->ValidateMovementInfo(&moveDismissVehicle.Status);
-    _player->m_movementInfo = moveDismissVehicle.Status;
+    if (moveDismissVehicle.Status.guid != vehicleGUID)
+    {
+        TC_LOG_ERROR("network", "Player {} tried to dismiss a controlled vehicle ({}) that he has no control over. Possible cheater or malformed packet.",
+            GetPlayer()->GetGUID().ToString().c_str(), vehicleGUID.ToString().c_str());
+        return;
+    }
 
     _player->ExitVehicle();
 }