Updated IsValidPlayer

B3none · Jan 28, 2024 · a4363fd · a4363fd
1 parent 1a11239
commit a4363fd
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/ClutchAnnouncePlugin.cs b/ClutchAnnouncePlugin.cs
@@ -64,7 +64,7 @@ public HookResult OnRoundEnd(EventRoundEnd @event, GameEventInfo info)
     {
         Console.WriteLine($"{LogPrefix}OnRoundEnd event fired!");
 
-        if (_clutchPlayer != null && IsValidPlayer(_clutchPlayer) && (CsTeam)@event.Winner == _clutchTeam)
+        if (IsValidPlayer(_clutchPlayer) && (CsTeam)@event.Winner == _clutchTeam)
         {
             Server.PrintToChatAll(MessagePrefix + _translator["clutch_announce.clutched", _clutchPlayer.PlayerName, _opponents]);
         }
@@ -118,11 +118,12 @@ private void CheckAlive()
     }
 
     // Helpers
-    private static bool IsValidPlayer(CCSPlayerController player)
+    private static bool IsValidPlayer(CCSPlayerController? player)
     {
-        return player.IsValid 
-           && player.PlayerPawn.IsValid
-           && player.PlayerPawn.Value != null
-           && player.PlayerPawn.Value.IsValid;
+        return player != null
+            && player.IsValid 
+            && player.PlayerPawn.IsValid
+            && player.PlayerPawn.Value != null
+            && player.PlayerPawn.Value.IsValid;
     }
 }