Fixed occasional invalid entity errors

Psykotikism · Dec 26, 2022 · 3724919 · 3724919
1 parent 71784cd
commit 3724919
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 #### General
 - Fixed a potential memory leak caused by fixing the Tank's position when stuck.
+- Fixed occasional invalid entity errors. (Thanks to `Mi.Cura` for reporting!)
 
 #### Config Files
 - Fixed parsing errors for config files that use one of the other formats.

diff --git a/addons/sourcemod/mutant_tanks_updater.txt b/addons/sourcemod/mutant_tanks_updater.txt
@@ -15,6 +15,7 @@
 		"Notes"		"Bug Fixes:"
 		"Notes"		"General:"
 		"Notes"		"- Fixed a potential memory leak caused by fixing the Tank's position when stuck."
+		"Notes"		"- Fixed occasional invalid entity errors. (Thanks to \"Mi.Cura\" for reporting!)"
 		"Notes"		"Config Files:"
 		"Notes"		"- Fixed parsing errors for config files that use one of the other formats."
 		"Notes"		"Abilities:"

diff --git a/addons/sourcemod/plugins/mutant_tanks/mt_abilities.smx b/addons/sourcemod/plugins/mutant_tanks/mt_abilities.smx
diff --git a/addons/sourcemod/plugins/mutant_tanks/mt_abilities2.smx b/addons/sourcemod/plugins/mutant_tanks/mt_abilities2.smx
diff --git a/addons/sourcemod/plugins/mutant_tanks/mutant_tanks.smx b/addons/sourcemod/plugins/mutant_tanks/mutant_tanks.smx
diff --git a/addons/sourcemod/scripting/mutant_tanks/abilities2/mt_shield.sp b/addons/sourcemod/scripting/mutant_tanks/abilities2/mt_shield.sp
@@ -546,7 +546,10 @@ public Action OnPlayerRunCmd(int client, int &buttons, int &impulse, float vel[3
 
 void OnInfectedSpawnPost(int entity)
 {
-	SDKHook(entity, SDKHook_OnTakeDamage, OnShieldTakeDamage);
+	if (bIsValidEntity(entity))
+	{
+		SDKHook(entity, SDKHook_OnTakeDamage, OnShieldTakeDamage);
+	}
 }
 
 Action OnShieldTakeDamage(int victim, int &attacker, int &inflictor, float &damage, int &damagetype)

diff --git a/addons/sourcemod/scripting/mutant_tanks/mutant_tanks.sp b/addons/sourcemod/scripting/mutant_tanks/mutant_tanks.sp
@@ -15901,9 +15901,12 @@ void OnEffectSpawnPost(int entity)
 
 void OnInfectedSpawnPost(int entity)
 {
-	SDKHook(entity, SDKHook_OnTakeDamage, OnInfectedTakeDamage);
-	SDKHook(entity, SDKHook_OnTakeDamage, OnPlayerTakeDamage);
-	SDKHook(entity, SDKHook_OnTakeDamagePost, OnPlayerTakeDamagePost);
+	if (bIsValidEntity(entity))
+	{
+		SDKHook(entity, SDKHook_OnTakeDamage, OnInfectedTakeDamage);
+		SDKHook(entity, SDKHook_OnTakeDamage, OnPlayerTakeDamage);
+		SDKHook(entity, SDKHook_OnTakeDamagePost, OnPlayerTakeDamagePost);
+	}
 }
 
 void OnPropSpawnPost(int entity)