Fix crash in onClientVehicleCollision (#600)

Event 'onClientVehicleCollision' won't be called for blown vehicles.
multitheftauto · Oct 26, 2018 · 961f7ed · 961f7ed
1 parent 0f121bd
commit 961f7ed
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -4536,12 +4536,12 @@ bool CClientGame::VehicleCollisionHandler(CVehicleSAInterface* pCollidingVehicle
 {
     if (pCollidingVehicle && pCollidedWith)
     {
-        CVehicle*      pColliderVehicle = g_pGame->GetPools()->GetVehicle((DWORD*)pCollidingVehicle);
-        CClientEntity* pVehicleClientEntity = m_pManager->FindEntity(pColliderVehicle, true);
-        if (pVehicleClientEntity)
+        CVehicle*       pColliderVehicle = g_pGame->GetPools()->GetVehicle((DWORD*)pCollidingVehicle);
+        CClientEntity*  pVehicleClientEntity = m_pManager->FindEntity(pColliderVehicle, true);
+        CClientVehicle* pClientVehicle = static_cast<CClientVehicle*>(pVehicleClientEntity);
+
+        if (pClientVehicle && !pClientVehicle->IsBlown())
         {
-            CClientVehicle* pClientVehicle = static_cast<CClientVehicle*>(pVehicleClientEntity);
-
             CEntity*       pCollidedWithEntity = g_pGame->GetPools()->GetEntity((DWORD*)pCollidedWith);
             CClientEntity* pCollidedWithClientEntity = NULL;
             if (pCollidedWithEntity)