Crash Fix

caxanga334 · Dec 8, 2024 · 57a0024 · 57a0024
1 parent a90b599
commit 57a0024
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/extension/bot/interfaces/inventory.cpp b/extension/bot/interfaces/inventory.cpp
@@ -32,7 +32,7 @@ void IInventory::Reset()
 
 	edict_t* weapon = GetBot()->GetActiveWeapon();
 
-	if (weapon != nullptr)
+	if (UtilHelpers::IsValidEdict(weapon))
 	{
 		m_cachedActiveWeapon = std::make_shared<CBotWeapon>(weapon);
 	}
@@ -48,7 +48,7 @@ void IInventory::Update()
 
 	edict_t* weapon = GetBot()->GetActiveWeapon();
 
-	if (weapon != nullptr && m_cachedActiveWeapon->GetEdict() != weapon)
+	if (UtilHelpers::IsValidEdict(weapon) && m_cachedActiveWeapon->GetEdict() != weapon)
 	{
 		m_cachedActiveWeapon = std::make_shared<CBotWeapon>(weapon);
 	}
@@ -95,7 +95,7 @@ void IInventory::BuildInventory()
 
 		edict_t* weapon = gamehelpers->EdictOfIndex(index);
 
-		if (!weapon || weapon->IsFree() || weapon->GetIServerEntity() == nullptr)
+		if (!UtilHelpers::IsValidEdict(weapon))
 			continue;
 
 		m_weapons.emplace_back(new CBotWeapon(weapon));
@@ -168,7 +168,7 @@ std::shared_ptr<CBotWeapon> IInventory::GetActiveBotWeapon()
 {
 	edict_t* weapon = GetBot()->GetActiveWeapon();
 
-	if (weapon == nullptr)
+	if (!UtilHelpers::IsValidEdict(weapon))
 	{
 		return nullptr;
 	}

diff --git a/extension/util/helpers.h b/extension/util/helpers.h
@@ -39,6 +39,16 @@ namespace UtilHelpers
 		return edict != nullptr;
 	}
 
+	inline bool IsValidEdict(edict_t* edict)
+	{
+		if (edict == nullptr || edict->IsFree() || edict->GetIServerEntity() == nullptr)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
 	// Returns whether or not an entity has a valid networkable edict.
 	bool IsEntNetworkable(int index);
 	// Returns whether or not an entity has a valid networkable edict.