Check validitiy

edgegamers · Feb 3, 2024 · 612482c · 612482c
1 parent 41562ef
commit 612482c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/mod/Jailbreak.Teams/Queue/QueueBehavior.cs b/mod/Jailbreak.Teams/Queue/QueueBehavior.cs
@@ -135,7 +135,7 @@ public void ForceGuard(CCSPlayerController player)
 	/// <returns></returns>
 	public HookResult OnRequestToJoinTeam(CCSPlayerController? invoked, CommandInfo command)
 	{
-		if (invoked == null)
+		if (invoked == null || !invoked.IsValid)
 			return HookResult.Continue;
 
 		var state = _state.Get(invoked);
@@ -173,8 +173,11 @@ public HookResult OnRequestToJoinTeam(CCSPlayerController? invoked, CommandInfo
 	[GameEventHandler]
 	public HookResult OnPlayerSpawn(EventPlayerSpawn ev, GameEventInfo info)
 	{
-		var state = _state.Get(ev.Userid);
 		var player = ev.Userid;
+		if (!player.IsValid)
+			return HookResult.Continue;
+
+		var state = _state.Get(ev.Userid);
 
 		if (player.GetTeam() == CsTeam.CounterTerrorist && !state.IsGuard)
 		{