minor changes and css version bump

Author: audiomaster99

Events.cs

@@ -11,7 +11,6 @@ public sealed partial class SpawnProt
 		public void RegisterEventsListeners()
 		{
 			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn, HookMode.Pre);
-			RegisterEventHandler<EventRoundPrestart>(OnRoundPrestart);
 			RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
 			RegisterEventHandler<EventPlayerDeath>(OnPlayerDeath, HookMode.Pre);
 			RegisterEventHandler<EventWeaponFire>(OnWeaponFire);
@@ -34,27 +33,16 @@ public void RegisterEventsListeners()
 			RegisterListener<Listeners.OnMapStart>(name =>
 			{
 				protectedPlayers.Clear();
-				AddTimer(1.0f, GetGameRules);
+				gameRules = null;
 
 				AddTimer(1.0f, () =>
 				{
-					_freezeTime = ConVar.Find("mp_freezetime")!.GetPrimitiveValue<int>() - 1;
+					_freezeTime = ConVar.Find("mp_freezetime")!.GetPrimitiveValue<int>();
+					GetGameRules();
 				});
 			});
 		}
 
-		public HookResult OnRoundPrestart(EventRoundPrestart @event, GameEventInfo info)
-		{
-			protectedPlayers.Clear();
-			foreach (var state in _playerStates.Values)
-			{
-				state.ShowCenterMessage = false;
-				state.SpawnTimer?.Kill();
-			}
-
-			return HookResult.Continue;
-		}
-
 		public HookResult OnRoundEnd(EventRoundEnd @event, GameEventInfo info)
 		{
 			protectedPlayers.Clear();
@@ -71,7 +59,7 @@ public HookResult OnPlayerDeath(EventPlayerDeath @event, GameEventInfo info)
 		{
 			var player = @event.Userid;
 
-			if (player is null || player.IsBot() || !_playerStates.TryGetValue(player.Index, out var state))
+			if (!player.IzGud() || !_playerStates.TryGetValue(player.Index, out var state))
 				return HookResult.Continue;
 
 			protectedPlayers.Remove(player);
@@ -84,12 +72,8 @@ public HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
 		{
 			var player = @event.Userid;
 
-			if (player is null || player.IsBot() || !player.IzGud() ||
-				(Config.CTProtOnly && player.Team == CsTeam.Terrorist) ||
-				IsWarmup)
-			{
+			if (!player.IzGud() || (Config.CTProtOnly && player.Team == CsTeam.Terrorist) || IsWarmup)
 				return HookResult.Continue;
-			}
 
 			StartSpawnProtection(player);
 
@@ -102,7 +86,7 @@ public static HookResult OnTakeDamage(DynamicHook hook)
 			var playerPawn = hook.GetParam<CCSPlayerPawn>(0);
 			var player = playerPawn?.Controller.Value?.As<CCSPlayerController>();
 
-			if (player is null || player.IsBot() || !player.IsProtected())
+			if (!player.IzGud() || !player.IsProtected())
 				return HookResult.Continue;
 
 			hook.SetReturn(false);
@@ -116,7 +100,7 @@ public HookResult OnWeaponFire(EventWeaponFire @event, GameEventInfo info)
 
 			CCSPlayerController? player = @event.Userid;
 
-			if (player is null || player.IsBot() || !player.IsAlive() || !player.IsProtected())
+			if (!player.IzGud() || !player.IsProtected())
 				return HookResult.Continue;
 
 			StopSpawnProtection(player, _playerStates[player.Index]);
@@ -128,7 +112,7 @@ public HookResult OnPlayerActivate(EventPlayerActivate @event, GameEventInfo _)
 		{
 			CCSPlayerController? player = @event.Userid;
 
-			if (player is not null && player.IzGud() && !player.IsBot())
+			if (player.IzGud())
 				playerCache.Add(player);
 
 			return HookResult.Continue;
@@ -138,7 +122,7 @@ public HookResult OnPlayerDisconnect(EventPlayerDisconnect @event, GameEventInfo
 		{
 			CCSPlayerController? player = @event.Userid;
 
-			if (player is null || player.IsBot())
+			if (!player.IzGud())
 				return HookResult.Continue;
 
 			protectedPlayers.Remove(player);

Extensions.cs

@@ -1,5 +1,6 @@
 namespace SpawnProtection
 {
+	using System.Diagnostics.CodeAnalysis;
 	using CounterStrikeSharp.API.Core;
 	using static SpawnProtection.SpawnProt;
 
@@ -10,13 +11,13 @@ public static bool IsProtected(this CCSPlayerController player)
 			|| Instance._playerStates.TryGetValue(player.Index, out var playerState)
 			&& playerState.ProtectionState == ProtectionState.Protected;
 
-		public static bool IzGud(this CCSPlayerController? player)
-			=> player?.IsValid == true && player.PlayerPawn?.IsValid == true;
+		public static bool IzGud([NotNullWhen(true)] this CCSPlayerController? player)
+			=> player?.IsValid == true && player.PlayerPawn?.IsValid == true && !player.IsBot();
 
 		public static bool IsBot(this CCSPlayerController? player)
 			=> player?.IsBot == true || player?.IsHLTV == true;
 
 		public static bool IsAlive(this CCSPlayerController player)
-			=> player.Pawn.Value?.LifeState == (byte)LifeState_t.LIFE_ALIVE && player.PlayerPawn.Value?.Health > 0;
+			=> player.PlayerPawn.Value?.LifeState == (byte)LifeState_t.LIFE_ALIVE && player.PlayerPawn.Value?.Health > 0;
 	}
 }

PlayerState.cs

@@ -5,8 +5,8 @@ namespace SpawnProtection
 
 	public class PlayerState
 	{
-		public ProtectionState ProtectionState { get; set; } = ProtectionState.None;
-		public bool ShowCenterMessage { get; set; }
+		public ProtectionState ProtectionState { get; set; } = ProtectionState.Protected;
+		public bool ShowCenterMessage { get; set; } = true;
 		public float ProtectionTimer { get; set; } = Instance.Config.SpawnProtTime;
 		public Timer? SpawnTimer { get; set; }
 	}

Plugin.cs

@@ -110,7 +110,7 @@ public void StartSpawnProtection(CCSPlayerController player)
             state.ShowCenterMessage = true;
             state.ProtectionState = ProtectionState.Protected;
             state.ProtectionTimer = Config.SpawnProtTime;
-            Server.NextFrame(() => HandleTransparentModel(player, true));
+            Server.NextFrame(() => HandleTransparentModel(player));
 
             AddTimer(IsFreezeTime ? _freezeTime : 0f, () => CreateProtectionTimer(player, state));
         }

Utils.cs

@@ -47,12 +47,12 @@ private string GetColorBasedOnProgress(float progress, float brightness = 1.0f)
 			return $"#{red:X2}{green:X2}{blue:X2}";
 		}
 
-		private void HandleTransparentModel(CCSPlayerController player, bool isTransparent = false)
+		private void HandleTransparentModel(CCSPlayerController? player, bool isTransparent = false)
 		{
 			if (!Config.TransparentModel)
 				return;
 
-			if (player.IsBot() || !player.IsAlive() || player.PlayerPawn is null or { IsValid: false } || player.PlayerPawn.Value is null)
+			if (!player.IzGud() || !player.IsAlive() || player.PlayerPawn.Value == null)
 				return;
 
 			if (isTransparent)