Don't restore default handling for server-sided vehicle changed their model on client-side

That commit won't break any backwards compatibility.
Changing the model for vehicles created on the server side resets the handling only if the vehicle is created locally (client - resets client handling, server - resets server handling).
The problem was caused by the client not checking if the vehicle belongs to them (if it is local) and resetting the handling without checking.

Author: Inder00

Client/mods/deathmatch/logic/CClientModel.cpp

@@ -137,7 +137,7 @@ void CClientModel::RestoreEntitiesUsingThisModel()
             unsigned short         usParentID = g_pGame->GetModelInfo(m_iModelID)->GetParentID();
 
             unloadModelsAndCallEvents(pVehicleManager->IterBegin(), pVehicleManager->IterEnd(), usParentID,
-                                      [=](auto& element) { element.SetModelBlocking(usParentID, 255, 255); });
+                                      [=](auto& element) { element.SetModelBlocking(usParentID, 255, 255, element.IsLocalEntity()); });
             break;
         }
     }

Client/mods/deathmatch/logic/CClientVehicle.cpp

@@ -1006,7 +1006,7 @@ void CClientVehicle::SetTurretRotation(float fHorizontal, float fVertical)
     m_fTurretVertical = fVertical;
 }
 
-void CClientVehicle::SetModelBlocking(unsigned short usModel, unsigned char ucVariant, unsigned char ucVariant2)
+void CClientVehicle::SetModelBlocking(unsigned short usModel, unsigned char ucVariant, unsigned char ucVariant2, bool restoreHandling)
 {
     // Different vehicle ID than we have now?
     if (m_usModel != usModel)
@@ -1068,32 +1068,35 @@ void CClientVehicle::SetModelBlocking(unsigned short usModel, unsigned char ucVa
         m_ucMaxPassengers = CClientVehicleManager::GetMaxPassengerCount(usModel);
 
         // Reset handling to fit the vehicle
-        ushort usHandlingModelID = usModel;
-        if (usHandlingModelID < 400 || usHandlingModelID > 611)
-            usHandlingModelID = m_pModelInfo->GetParentID();
+        if (restoreHandling)
+        {
+            ushort usHandlingModelID = usModel;
+            if (usHandlingModelID < 400 || usHandlingModelID > 611)
+                usHandlingModelID = m_pModelInfo->GetParentID();
 
-        m_pOriginalHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalHandlingData((eVehicleTypes)usHandlingModelID);
-        m_pHandlingEntry->Assign(m_pOriginalHandlingEntry);
+            m_pOriginalHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalHandlingData((eVehicleTypes)usHandlingModelID);
+            m_pHandlingEntry->Assign(m_pOriginalHandlingEntry);
 
-        m_pOriginalFlyingHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalFlyingHandlingData((eVehicleTypes)usHandlingModelID);
-        m_pFlyingHandlingEntry->Assign(m_pOriginalFlyingHandlingEntry);
+            m_pOriginalFlyingHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalFlyingHandlingData((eVehicleTypes)usHandlingModelID);
+            m_pFlyingHandlingEntry->Assign(m_pOriginalFlyingHandlingEntry);
 
-        m_pOriginalBoatHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalBoatHandlingData((eVehicleTypes)usHandlingModelID);
-        if (m_pOriginalBoatHandlingEntry)
-        {
-            if (!m_pBoatHandlingEntry)
-                m_pBoatHandlingEntry = g_pGame->GetHandlingManager()->CreateBoatHandlingData();
+            m_pOriginalBoatHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalBoatHandlingData((eVehicleTypes)usHandlingModelID);
+            if (m_pOriginalBoatHandlingEntry)
+            {
+                if (!m_pBoatHandlingEntry)
+                    m_pBoatHandlingEntry = g_pGame->GetHandlingManager()->CreateBoatHandlingData();
 
-            m_pBoatHandlingEntry->Assign(m_pOriginalBoatHandlingEntry);
-        }
+                m_pBoatHandlingEntry->Assign(m_pOriginalBoatHandlingEntry);
+            }
 
-        m_pOriginalBikeHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalBikeHandlingData((eVehicleTypes)usHandlingModelID);
-        if (m_pOriginalBikeHandlingEntry)
-        {
-            if (!m_pBikeHandlingEntry)
-                m_pBikeHandlingEntry = g_pGame->GetHandlingManager()->CreateBikeHandlingData();
+            m_pOriginalBikeHandlingEntry = g_pGame->GetHandlingManager()->GetOriginalBikeHandlingData((eVehicleTypes)usHandlingModelID);
+            if (m_pOriginalBikeHandlingEntry)
+            {
+                if (!m_pBikeHandlingEntry)
+                    m_pBikeHandlingEntry = g_pGame->GetHandlingManager()->CreateBikeHandlingData();
 
-            m_pBikeHandlingEntry->Assign(m_pOriginalBikeHandlingEntry);
+                m_pBikeHandlingEntry->Assign(m_pOriginalBikeHandlingEntry);
+            }
         }
 
         ApplyHandling();

Client/mods/deathmatch/logic/CClientVehicle.h

@@ -229,7 +229,7 @@ class CClientVehicle : public CClientStreamElement
     void SetTurretRotation(float fHorizontal, float fVertical);
 
     unsigned short GetModel() { return m_usModel; };
-    void           SetModelBlocking(unsigned short usModel, unsigned char ucVariant, unsigned char ucVariant2);
+    void           SetModelBlocking(unsigned short usModel, unsigned char ucVariant, unsigned char ucVariant2, bool restoreHandling);
 
     unsigned char GetVariant() { return m_ucVariation; };
     unsigned char GetVariant2() { return m_ucVariation2; };

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -1504,7 +1504,7 @@ bool CStaticFunctionDefinitions::SetElementModel(CClientEntity& Entity, unsigned
             if (!CClientVehicleManager::IsValidModel(usModel))
                 return false;
 
-            Vehicle.SetModelBlocking(usModel, 255, 255);
+            Vehicle.SetModelBlocking(usModel, 255, 255, Entity.IsLocalEntity());
 
             CLuaArguments Arguments;
             Arguments.PushNumber(usCurrentModel);

Client/mods/deathmatch/logic/rpc/CElementRPCs.cpp

@@ -474,7 +474,7 @@ void CElementRPCs::SetElementModel(CClientEntity* pSource, NetBitStreamInterface
 
             if (usCurrentModel != usModel)
             {
-                pVehicle->SetModelBlocking(usModel, ucVariant, ucVariant2);
+                pVehicle->SetModelBlocking(usModel, ucVariant, ucVariant2, true);
 
                 CLuaArguments Arguments;
                 Arguments.PushNumber(usCurrentModel);