Update 6

Author: G_Moris

Client/game_sa/CHandlingManagerSA.cpp

@@ -124,7 +124,7 @@ static bool IsVehicleModel(std::uint32_t model) noexcept
 {
     try
     {
-        const auto* pModelInfo = pGame->GetModelInfo(model);
+        const auto* const pModelInfo = pGame->GetModelInfo(model);
         return pModelInfo && pModelInfo->IsVehicle();
     }
     catch (...)

Client/game_sa/CModelInfoSA.cpp

@@ -286,9 +286,12 @@ bool CModelInfoSA::IsVehicle() const
     if (m_dwModelID >= 20000)
         return false;
 
+    if (!IsAllocatedInArchive())
+        return false;
+
     // NOTE(botder): m_pInterface might be a nullptr here, we can't use it
-    CBaseModelInfoSAInterface* model = ppModelInfo[m_dwModelID];
-    return model != nullptr && reinterpret_cast<intptr_t>(model->VFTBL) == vftable_CVehicleModelInfo;
+    CBaseModelInfoSAInterface* pModel = ppModelInfo[m_dwModelID];
+    return pModel && reinterpret_cast<intptr_t>(pModel->VFTBL) == vftable_CVehicleModelInfo;
 }
 
 bool CModelInfoSA::IsPlayerModel()
@@ -748,9 +751,16 @@ bool CModelInfoSA::IsValid()
     return true;
 }
 
-bool CModelInfoSA::IsAllocatedInArchive()
+bool CModelInfoSA::IsAllocatedInArchive() const noexcept
 {
-    return pGame->GetStreaming()->GetStreamingInfo(m_dwModelID)->sizeInBlocks > 0;
+    try
+    {
+        return pGame->GetStreaming()->GetStreamingInfo(m_dwModelID)->sizeInBlocks > 0;
+    }
+    catch (...)
+    {
+        return false;
+    }
 }
 
 float CModelInfoSA::GetDistanceFromCentreOfMassToBaseOfModel()

Client/game_sa/CModelInfoSA.h

@@ -374,7 +374,7 @@ class CModelInfoSA : public CModelInfo
     static void    StaticResetFlags();
     CBoundingBox*  GetBoundingBox();
     bool           IsValid();
-    bool           IsAllocatedInArchive();
+    bool           IsAllocatedInArchive() const noexcept;
     float          GetDistanceFromCentreOfMassToBaseOfModel();
     unsigned short GetTextureDictionaryID();
     void           SetTextureDictionaryID(unsigned short usID);

Client/game_sa/CPoolsSA.cpp

@@ -86,11 +86,11 @@ CVehicle* CPoolsSA::AddVehicle(CClientVehicle* pClientVehicle, std::uint16_t mod
         if (!pInterface)
             return nullptr;
 
-        const auto* modelInfo = pGame->GetModelInfo(model);
-        if (!modelInfo || !modelInfo->IsVehicle())
+        const auto* const pModelInfo = pGame->GetModelInfo(model);
+        if (!pModelInfo || !pModelInfo->IsVehicle())
             return nullptr;
 
-        auto vehicleClass = static_cast<VehicleClass>(modelInfo->GetVehicleType());
+        auto vehicleClass = static_cast<VehicleClass>(pModelInfo->GetVehicleType());
 
         std::unique_ptr<CVehicleSA> vehicle = nullptr;
         switch (vehicleClass)

Client/sdk/game/CModelInfo.h

@@ -166,7 +166,7 @@ class CModelInfo
     virtual void           SetIdeFlag(eModelIdeFlag eFlag, bool bState) = 0;
     virtual CBoundingBox*  GetBoundingBox() = 0;
     virtual bool           IsValid() = 0;
-    virtual bool           IsAllocatedInArchive() = 0;
+    virtual bool           IsAllocatedInArchive() const noexcept = 0;
     virtual unsigned short GetTextureDictionaryID() = 0;
     virtual void           SetTextureDictionaryID(unsigned short usTxdId) = 0;
     virtual void           ResetTextureDictionaryID() = 0;

Server/mods/deathmatch/logic/CVehicle.cpp

@@ -850,12 +850,14 @@ void CVehicle::GetInitialDoorStates(SFixedArray<unsigned char, MAX_DOORS>& ucOut
 
 void CVehicle::GenerateHandlingData() noexcept
 {
+    const auto handlingManager = g_pGame->GetHandlingManager();
+
     // Make a new CHandlingEntry
     if (!m_HandlingEntry)
-        m_HandlingEntry = g_pGame->GetHandlingManager()->CreateHandlingData();
+        m_HandlingEntry = handlingManager->CreateHandlingData();
 
     // Apply the model handling info
-    m_HandlingEntry->ApplyHandlingData(g_pGame->GetHandlingManager()->GetModelHandlingData(m_usModel));
+    m_HandlingEntry->ApplyHandlingData(handlingManager->GetModelHandlingData(m_usModel));
 
     m_bHandlingChanged = false;
 }