Prevent attempts to change class as special infected

redsunservers · Dec 15, 2023 · 5823c1f · 5823c1f
1 parent 6a6e063
commit 5823c1f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/addons/sourcemod/scripting/szf/console.sp b/addons/sourcemod/scripting/szf/console.sp
@@ -158,6 +158,9 @@ public Action Console_JoinClass(int iClient, const char[] sCommand, int iArgs)
 
 	if (IsZombie(iClient))
 	{
+		if (g_nInfected[iClient] != Infected_None)
+			return Plugin_Handled;
+
 		//Check if the player selected a valid zombie class
 		if (IsValidZombieClass(TF2_GetClass(sArg)))
 		{

diff --git a/addons/sourcemod/scripting/szf/infected.sp b/addons/sourcemod/scripting/szf/infected.sp
@@ -31,14 +31,11 @@ static int g_iTankHealthSubtract[MAXPLAYERS];
 
 public void Infected_OnTankSpawn(int iClient)
 {
-	if (g_flTankLifetime[iClient] < GetGameTime() - 0.5)	//Prevent multiple announces from spawnroom
-	{
-		//TAAAAANK
-		CPrintToChatAll("%t", "Tank_Spawn", "{red}");
-		Sound_PlayInfectedVoToAll(Infected_Tank, SoundVo_Fire);
-
-		g_iTanksSpawned++;
-	}
+	//TAAAAANK
+	CPrintToChatAll("%t", "Tank_Spawn", "{red}");
+	Sound_PlayInfectedVoToAll(Infected_Tank, SoundVo_Fire);
+
+	g_iTanksSpawned++;
 
 	g_hTimerTank[iClient] = CreateTimer(1.0, Infected_TankTimer, GetClientSerial(iClient), TIMER_REPEAT);
 	g_flTankLifetime[iClient] = GetGameTime();