Bug Fix

Author: itsAudioo

Events.cs

@@ -15,7 +15,6 @@ public void RegisterEventsListeners()
 		{
 			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
 			RegisterEventHandler<EventPlayerHurt>(OnPlayerHurt);
-			RegisterEventHandler<EventRoundStart>(OnRoundStart);
 			RegisterEventHandler<EventRoundPrestart>(OnRoundPrestart);
 			RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
 			RegisterEventHandler<EventPlayerDeath>(OnPlayerDeath);
@@ -38,43 +37,24 @@ public void RegisterEventsListeners()
 			Logger.LogInformation("Registered Events and Listeners");
 		}
 
-		public CounterStrikeSharp.API.Modules.Timers.Timer? SpawnTimer;
+		public Timer? SpawnTimer { get; set; }
 		public CounterStrikeSharp.API.Modules.Timers.Timer? renderTimer;
-		public float CountdownTimer;
 
-		public HookResult OnRoundStart(EventRoundStart @event, GameEventInfo info)
-		{
-			SpawnTimer?.Kill();
-			CountdownTimer = Config.SpawnProtTime;
-
-			if (IsWarmup)
-				return HookResult.Continue;
-
-			AddTimer(FreezeTime, () =>
-			{
-				SpawnTimer = AddTimer(0.1f, () =>
-				{
-					if (CountdownTimer <= 0) { SpawnTimer?.Kill(); return; }
-					CountdownTimer -= 0.1f;
-				}, TimerFlags.REPEAT);
-			});
-			return HookResult.Continue;
-		}
 		public HookResult OnRoundPrestart(EventRoundPrestart @event, GameEventInfo info)
 		{
+			SpawnTimer?.Kill();
 			Utilities.GetPlayers().
-			Where(player => player is not null && player.IsValid == true).ToList().ForEach(x => HandleCenterMessage(x));
+			Where(player => player is not null && player.IsValid == true).ToList().ForEach(x => CenterMessage[x.Index] = false);
 
 			return HookResult.Continue;
 		}
 
 		public HookResult OnRoundEnd(EventRoundEnd @event, GameEventInfo info)
 		{
+			SpawnTimer?.Kill();
 			Utilities.GetPlayers().
 			Where(player => player is not null && player.IsValid == true).ToList().ForEach(x => CenterMessage[x.Index] = false);
 
-			SpawnTimer?.Kill();
-
 			return HookResult.Continue;
 		}
 
@@ -104,13 +84,21 @@ public HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
 			if (IsWarmup)
 				return HookResult.Continue;
 
-			AddTimer(FreezeTime, () =>
+			SpawnTimer?.Kill();
+			protTimer[player.Index] = Config.SpawnProtTime;
+
+			SpawnTimer = AddTimer(0.1f, () =>
 			{
-				HandleSpawnProt(player);
+				if (protTimer[player.Index] <= 0) { SpawnTimer?.Kill(); return; }
+				protTimer[player.Index] -= 0.1f;
+			}, TimerFlags.REPEAT);
 
-				if (Config.TransparentModel)
-					HandlePlayerModel(player);
-			});
+			HandleSpawnProt(player);
+
+			if (Config.TransparentModel)
+				HandlePlayerModel(player);
+
+			HandleCenterMessage(player);
 
 			return HookResult.Continue;
 		}
@@ -156,7 +144,7 @@ private void HandleProtectedPlayer(CCSPlayerController player, EventPlayerHurt @
 			Utilities.SetStateChanged(player.PlayerPawn.Value, "CCSPlayerPawn", "m_ArmorValue");
 
 			if (Config.SpawnProtCenterMsg && player.IsAlive())
-				player.PrintToCenter($"{Localizer["player_isprotected", (int)CountdownTimer]}");
+				player.PrintToCenter($"{Localizer["player_isprotected", (int)protTimer[player.Index]]}");
 
 			CCSPlayerController? Attacker = @event.Attacker;
 

Plugin.cs

@@ -8,10 +8,11 @@ public sealed partial class SpawnProt : BasePlugin, IPluginConfig<PluginConfig>
         public override string ModuleName => "SpawnProt";
         public override string ModuleAuthor => "audio_brutalci";
         public override string ModuleDescription => "Simple spawn protection for CS2";
-        public override string ModuleVersion => "0.0.3";
+        public override string ModuleVersion => "0.0.4";
 
         public static SpawnProtectionState[] playerHasSpawnProt = new SpawnProtectionState[64];
         public static readonly bool[] CenterMessage = new bool[64];
+        public static readonly float[] protTimer = new float[64];
         public static int FreezeTime;
         CCSGameRules? gameRules;
 
@@ -20,7 +21,7 @@ public void OnConfigParsed(PluginConfig config)
         {
             if (config.Version < Config.Version)
             {
-                base.Logger.LogWarning("The plugin configuration is outdated. Please consider updating the configuration file. [Expected: {0} | Current: {1}]", this.Config.Version, config.Version);
+                base.Logger.LogWarning("Plugin configuration is outdated! Please consider updating. [Expected: {0} | Current: {1}]", this.Config.Version, config.Version);
             }
 
             this.Config = config;
@@ -37,13 +38,13 @@ public override void Load(bool hotReload)
         }
         public void OnTick(CCSPlayerController player)
         {
-            float progressPercentage = CountdownTimer / Config.SpawnProtTime;
+            float progressPercentage = protTimer[player.Index] / Config.SpawnProtTime;
             string color = GetColorBasedOnProgress(progressPercentage);
             string progressBar = GenerateProgressBar(progressPercentage);
 
             player.PrintToCenterHtml(
                 $"<font class='fontSize-m' color='orange'>{Localizer["center_isprotected"]}</font><br>" +
-                $"[<font class='fontSize-m' color='{color}'>{(int)CountdownTimer}</font><font color='white'>] SECONDS LEFT!</font><br>" +
+                $"[<font class='fontSize-m' color='{color}'>{(int)protTimer[player.Index]}</font><font color='white'>] SECONDS LEFT!</font><br>" +
                 $"<font class='fontSize-l' color='{color}'>{progressBar}</font>"
             );
         }
@@ -55,7 +56,7 @@ public void HandleSpawnProt(CCSPlayerController player)
             AddTimer(Config.SpawnProtTime, () =>
             {
                 playerHasSpawnProt[player.Index] = SpawnProtectionState.None;
-                AddTimer(1.0f, () => { player.PrintToCenterAlert($" {Localizer["player_isnotprotected"]} "); });
+                AddTimer(0.8f, () => { player.PrintToCenterAlert($" {Localizer["player_isnotprotected"]} "); });
             });
         }
 
@@ -71,7 +72,7 @@ public void HandlePlayerModel(CCSPlayerController player)
         public void HandleCenterMessage(CCSPlayerController player)
         {
             CenterMessage[player.Index] = true;
-            AddTimer(Config.SpawnProtTime + 1.0f, () => { CenterMessage[player.Index] = false; });
+            AddTimer(Config.SpawnProtTime, () => { CenterMessage[player.Index] = false; });
         }
     }
 }

Utils.cs

@@ -82,13 +82,13 @@ private void ResetPlayerColor(CCSPlayerController? player)
 
 			Color defaultColor = Color.FromArgb(255, 255, 255, 255);
 			Server.NextFrame(() =>
-						{
-							if (player.PlayerPawn is not null && player.PlayerPawn.Value is not null && player.IsAlive())
-							{
-								player.PlayerPawn.Value.Render = defaultColor;
-								Utilities.SetStateChanged(player.PlayerPawn.Value, "CBaseModelEntity", "m_clrRender");
-							}
-						});
+			{
+				if (player.PlayerPawn is not null && player.PlayerPawn.Value is not null && player.IsAlive())
+				{
+					player.PlayerPawn.Value.Render = defaultColor;
+					Utilities.SetStateChanged(player.PlayerPawn.Value, "CBaseModelEntity", "m_clrRender");
+				}
+			});
 		}
 		void GetGameRules() => gameRules = Utilities.FindAllEntitiesByDesignerName<CCSGameRulesProxy>("cs_gamerules").First().GameRules!;