From 5d01fa36935b90be09f061e01592d92e5cb45ec4 Mon Sep 17 00:00:00 2001
From: ColombuxMaximus <momemtumcorpfzco@gmail.com>
Date: Sun, 8 Jun 2025 04:40:18 +0400
Subject: [PATCH] Update CClientModel.cpp

---
 Client/mods/deathmatch/logic/CClientModel.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Client/mods/deathmatch/logic/CClientModel.cpp b/Client/mods/deathmatch/logic/CClientModel.cpp
index 906f77324c7..81d8f20e856 100644
--- a/Client/mods/deathmatch/logic/CClientModel.cpp
+++ b/Client/mods/deathmatch/logic/CClientModel.cpp
@@ -45,7 +45,8 @@ bool CClientModel::Allocate(ushort usParentID)
             pModelInfo->MakePedModel("PSYCHO");
             return true;
         case eClientModelType::OBJECT:
-            if (g_pClientGame->GetObjectManager()->IsValidModel(usParentID))
+            if (g_pClientGame->GetObjectManager()->IsValidModel(usParentID) &&
+                !CClientPedManager::IsValidWeaponModel(usParentID))
             {
                 pModelInfo->MakeObjectModel(usParentID);
                 return true;
@@ -53,7 +54,8 @@ bool CClientModel::Allocate(ushort usParentID)
             break;
         case eClientModelType::OBJECT_DAMAGEABLE:
         {
-            bool isValidModel = g_pClientGame->GetObjectManager()->IsValidModel(usParentID);
+            bool isValidModel = g_pClientGame->GetObjectManager()->IsValidModel(usParentID) &&
+                                !CClientPedManager::IsValidWeaponModel(usParentID);
             bool isDamagable = pParentModelInfo->IsDamageableAtomic();
             if (isValidModel && isDamagable)
             {
@@ -63,14 +65,16 @@ bool CClientModel::Allocate(ushort usParentID)
             break;
         }
         case eClientModelType::CLUMP:
-            if (g_pClientGame->GetObjectManager()->IsValidModel(usParentID))
+            if (g_pClientGame->GetObjectManager()->IsValidModel(usParentID) &&
+                !CClientPedManager::IsValidWeaponModel(usParentID))
             {
                 pModelInfo->MakeClumpModel(usParentID);
                 return true;
             }
             break;
         case eClientModelType::TIMED_OBJECT:
-            if (g_pClientGame->GetObjectManager()->IsValidModel(usParentID))
+            if (g_pClientGame->GetObjectManager()->IsValidModel(usParentID) &&
+                !CClientPedManager::IsValidWeaponModel(usParentID))
             {
                 pModelInfo->MakeTimedObjectModel(usParentID);
                 return true;