'Minor' fixes to freezing players

ipsvn · Apr 4, 2024 · 88a8e16 · 88a8e16
1 parent 6f5317c
commit 88a8e16
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/NadeManager.cs b/NadeManager.cs
@@ -3,6 +3,7 @@
 using ChaseMod.Utils.Memory;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using ChaseMod.Utils;
+using CounterStrikeSharp.API;
 
 namespace ChaseMod;
 internal class NadeManager
@@ -49,8 +50,15 @@ private HookResult CSmokeGrenadeProjectile_CreateHook(DynamicHook hook)
 
         var smoke = hook.GetReturn<CSmokeGrenadeProjectile>();
         smoke.NextThinkTick = -1;
+        Utilities.SetStateChanged(smoke, "CBaseEntity", "m_nNextThinkTick");
 
-        _plugin.AddTimer(_plugin.Config.StunThrowTime, () => FreezeGrenadeExplode(smoke));
+        _plugin.AddTimer(_plugin.Config.StunThrowTime, () =>
+        {
+            Server.NextFrame(() =>
+            {
+                FreezeGrenadeExplode(smoke);
+            });
+        });
 
         return HookResult.Continue;
     }
@@ -116,4 +124,5 @@ private void FreezeGrenadeExplode(CSmokeGrenadeProjectile smoke)
 
         smoke.Remove();
     }
+
 }
diff --git a/PlayerFreezeManager.cs b/PlayerFreezeManager.cs
@@ -5,6 +5,7 @@
 using ChaseMod.Utils;
 
 using Timer = CounterStrikeSharp.API.Modules.Timers.Timer;
+using Microsoft.Extensions.Logging;
 
 namespace ChaseMod;
 
@@ -27,9 +28,11 @@ public PlayerFreezeManager(ChaseMod chaseMod)
 
     public void Freeze(CCSPlayerController controller, float time, bool showEffect, bool sendMessage, bool resetVelocity)
     {
-        if (!controller.IsValid || !controller.PlayerPawn.IsValid) return;
+        if (!ChaseModUtils.IsRealPlayer(controller)) return;
         var pawn = controller.PlayerPawn.Value!;
 
+        ChaseMod.Logger.LogInformation($"Freeze player {pawn.Index}");
+
         var origVelocity = pawn.AbsVelocity.ToManaged();
         pawn.AbsVelocity.Set(0, 0, 0);
 
@@ -74,9 +77,11 @@ public void Freeze(CCSPlayerController controller, float time, bool showEffect,
 
     public void Unfreeze(CCSPlayerController controller, bool sendMessage)
     {
-        if (!controller.IsValid || !controller.PlayerPawn.IsValid) return;
+        if (!ChaseModUtils.IsRealPlayer(controller)) return;
         var pawn = controller.PlayerPawn.Value!;
 
+        ChaseMod.Logger.LogInformation($"Unfreeze player {pawn.Index}");
+
         pawn.UnfreezePlayer();
 
         if (_frozenPlayers.TryGetValue(controller, out var frozenState))

diff --git a/RoundStartFreezeTimeManager.cs b/RoundStartFreezeTimeManager.cs
@@ -50,12 +50,12 @@ public void Start()
 
             foreach (var player in ChaseModUtils.GetAllRealPlayers())
             {
-                if (!player.PlayerPawn.IsValid) continue;
                 var pawn = player.PlayerPawn.Value!;
 
                 if (player.Team == CsTeam.CounterTerrorist)
                 {
-                    _playerFreezeManager.Freeze(player, _plugin.Config.RoundStartFreezeTime, true, false, true);
+                    _playerFreezeManager.Freeze(player, _plugin.Config.RoundStartFreezeTime, 
+                                                true, false, true);
                 }
             }
 
@@ -71,12 +71,14 @@ public void Start()
                 _soundTimer = null;
             }
 
-            if (EnableCountDownSound == true)
+            if (EnableCountDownSound)
             {
-                _soundTimer = _plugin.AddTimer(1.0f, PlaySoundTimer, TimerFlags.REPEAT);
+                _soundTimer = _plugin.AddTimer(1.0f, PlaySoundTimer, 
+                                               TimerFlags.REPEAT | TimerFlags.STOP_ON_MAPCHANGE);
             }
 
-            _countdownTimer = _plugin.AddTimer(0.1f, CountdownTimerTick, TimerFlags.REPEAT);
+            _countdownTimer = _plugin.AddTimer(0.1f, CountdownTimerTick, 
+                                               TimerFlags.REPEAT | TimerFlags.STOP_ON_MAPCHANGE);
 
             return HookResult.Continue;
         });
@@ -96,7 +98,6 @@ private void CountdownTimerTick()
         {
             player.PrintToCenter(text);
         }
-
     }
 
     private void PlaySoundTimer()