Added sanity checks

tsuza · May 9, 2023 · 0a9d8f1 · 0a9d8f1
1 parent f83d553
commit 0a9d8f1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## Release Notes
 
+## [2.0.3]
+
+### Fixes
+
+- Check if the weapon exists during `TF2_OnConditionAdded` and `TF2_OnConditionRemoved`
+
 ## [2.0.2]
 
 ### Changes

diff --git a/scripting/attribute_viewmodel_override.sp b/scripting/attribute_viewmodel_override.sp
@@ -19,7 +19,7 @@ public Plugin myinfo =
 	name        =  "[TF2] Attribute: Viewmodel Override",
 	author      =  "Zabaniya001",
 	description =  "[TF2] Attributes to modify arms, arms animations, firstperson and thirdparson weapon model.",
-	version     =  "2.0.2",
+	version     =  "2.0.3",
 	url         =  "https://github.com/Zabaniya001/TF2CA-weaponmodel_override"
 };
 
@@ -273,8 +273,11 @@ public void TF2_OnConditionAdded(int client, TFCond cond)
 
 	int weapon = TF2_GetActiveWeapon(client);
 
-	SetEntityRenderMode(weapon, RENDER_NORMAL);
-	SetEntityRenderColor(weapon, 255, 255, 255, 255);
+	if(weapon > MaxClients && IsValidEntity(weapon))
+	{
+		SetEntityRenderMode(weapon, RENDER_NORMAL);
+		SetEntityRenderColor(weapon, 255, 255, 255, 255);
+	}
 
 	g_ClientWeaponModels[client].Delete(client);
 
@@ -285,9 +288,15 @@ public void TF2_OnConditionRemoved(int client, TFCond cond)
 {
 	if(cond != TFCond_Taunting)
 		return;
+
+	if(!IsClientInGame(client))
+		return;
 
 	int weapon = TF2_GetActiveWeapon(client);
 
+	if(weapon <= 0 || !IsValidEntity(weapon))
+		return;
+
 	OnDrawWeapon(client, weapon);
 
 	return;