Ensure set_turn_to_ice only checks weapons/wearables (#25)

The `weapon` parameter in OnTakeDamage is a `CBaseEntity*`, so attempting to use attribute hooks on it may fail.
nosoop · Dec 1, 2023 · 3e8c280 · 3e8c280
1 parent 9b7c45f
commit 3e8c280
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/scripting/tf2attribute_support.sp b/scripting/tf2attribute_support.sp
@@ -1151,8 +1151,11 @@ MRESReturn OnPlayerKilledPre(int client, Handle hParams) {
 	int weapon = DHookGetParamObjectPtrVar(hParams, 1, offs_CTakeDamageInfo_hWeapon,
 			ObjectValueType_Ehandle);
 
-	g_bShouldTurnToIce[client] = IsValidEntity(weapon)
-			&& TF2Attrib_HookValueInt(0, "set_turn_to_ice", weapon);
+	if (!IsValidEntity(weapon) || !weapon) {
+		return MRES_Ignored;
+	} else if (TF2Util_IsEntityWeapon(weapon) || TF2Util_IsEntityWearable(weapon)) {
+		g_bShouldTurnToIce[client] = TF2Attrib_HookValueInt(0, "set_turn_to_ice", weapon) != 0;
+	}
 
 	return MRES_Ignored;
 }