From f93f6cac3a8e03c285e6f7d89c7ccc76bc1d10eb Mon Sep 17 00:00:00 2001
From: rtldg <55846624+rtldg@users.noreply.github.com>
Date: Tue, 13 Jul 2021 15:21:23 +0000
Subject: [PATCH] fix tf2 respawn loop crash thing?

---
 addons/sourcemod/scripting/shavit-misc.sp | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/addons/sourcemod/scripting/shavit-misc.sp b/addons/sourcemod/scripting/shavit-misc.sp
index da403e3e..8cf52273 100644
--- a/addons/sourcemod/scripting/shavit-misc.sp
+++ b/addons/sourcemod/scripting/shavit-misc.sp
@@ -3117,40 +3117,25 @@ public void Shavit_OnRestart(int client, int track)
 		return;
 	}
 
-	if(!IsPlayerAlive(client))
+	if(gCV_RespawnOnRestart.BoolValue && !IsPlayerAlive(client))
 	{
 		if(gEV_Type == Engine_TF2)
 		{
-			TF2_ChangeClientTeam(client, view_as<TFTeam>(3));
+			TF2_ChangeClientTeam(client, view_as<TFTeam>(GetRandomInt(2, 3)));
 		}
-		
 		else
 		{
-			if(FindEntityByClassname(-1, "info_player_terrorist") != -1)
-			{
-				CS_SwitchTeam(client, 2);
-			}
-
-			else
-			{
-				CS_SwitchTeam(client, 3);
-			}
+			CS_SwitchTeam(client, GetRandomInt(2, 3));
 		}
 
 		if(gEV_Type == Engine_TF2)
 		{
 			TF2_RespawnPlayer(client);
 		}
-
 		else
 		{
 			CS_RespawnPlayer(client);
 		}
-
-		if(gCV_RespawnOnRestart.BoolValue)
-		{
-			RestartTimer(client, track);
-		}
 	}
 }