Make CNetAPI::WriteVehiclePuresync() use parent model ID when syncing…

… vehicles added with engineRequestModel()
multitheftauto · Oct 28, 2021 · 51d3288 · 51d3288 · Brian9221 · Oct 28, 2021
1 parent ee88dd4
commit 51d3288
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Client/mods/deathmatch/logic/CNetAPI.cpp b/Client/mods/deathmatch/logic/CNetAPI.cpp
@@ -1547,9 +1547,15 @@ void CNetAPI::WriteVehiclePuresync(CClientPed* pPlayerModel, CClientVehicle* pVe
     pPlayerModel->GetControllerState(ControllerState);
     WriteFullKeysync(ControllerState, BitStream);
 
+    // Use parent model ID for non-standard vehicle model IDs.
+    // This avoids a mismatch between client and server, ensuring doors and damage sync correctly.
+    int iModelID = pVehicle->GetModel();
+    if (iModelID < 400 || iModelID > 611)
+        iModelID = pVehicle->GetModelInfo()->GetParentID();
+
     // Write the clientside model
     if (BitStream.Version() >= 0x05F)
-        BitStream.Write((int)pVehicle->GetModel());
+        BitStream.Write(iModelID);
 
     // Grab the vehicle position
     CVector vecPosition;