Freeday: Fixed shanapu#400 and small improvements

azalty · Sep 18, 2022 · 64b42ba · 64b42ba
1 parent e2da710
commit 64b42ba
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/addons/sourcemod/scripting/MyJailbreak/freeday.sp b/addons/sourcemod/scripting/MyJailbreak/freeday.sp
@@ -704,9 +704,12 @@ void StartEventRound(bool thisround)
 			if (!IsClientInGame(i))
 				continue;
 
-			SetEntProp(i, Prop_Data, "m_takedamage", 0, 1);
+			if (IsPlayerAlive(i))
+			{
+				SetEntProp(i, Prop_Data, "m_takedamage", 0, 1);
 
-			SetEntityMoveType(i, MOVETYPE_NONE);
+				SetEntityMoveType(i, MOVETYPE_NONE);
+			}
 		}
 
 		CreateTimer(3.0, Timer_PrepareEvent);
@@ -770,14 +773,21 @@ void PrepareDay()
 
 		CreateInfoPanel(i);
 
-		SetEntProp(i, Prop_Send, "m_CollisionGroup", 2);  // 2 - none / 5 - 'default'
-
-		if (!gc_bdamage.BoolValue && IsValidClient(i))
+		if (IsPlayerAlive(i))
 		{
-			SetEntProp(i, Prop_Data, "m_takedamage", 0, 1);
-		}
+			SetEntProp(i, Prop_Send, "m_CollisionGroup", 2);  // 2 - none / 5 - 'default'
+
+			if (!gc_bdamage.BoolValue)
+			{
+				SetEntProp(i, Prop_Data, "m_takedamage", 0, 1);
+			}
+			else
+			{
+				SetEntProp(i, Prop_Data, "m_takedamage", 1, 1);
+			}
 
-		SetEntityMoveType(i, MOVETYPE_WALK);
+			SetEntityMoveType(i, MOVETYPE_WALK);
+		}
 	}
 
 	if (gp_bMyJailbreak)