Fix events with the spawn event

SCPStats · Oct 29, 2020 · 9755413 · 9755413
1 parent 0a26661
commit 9755413
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/SCPStats/EventHandler.cs b/SCPStats/EventHandler.cs
@@ -23,6 +23,7 @@ internal class EventHandler
         private static WebSocket ws = null;
         private static Task Pinger = null;
         private static bool PingerActive = false;
+        private static bool StartGrace = false;
 
         private static List<string> Queue = new List<string>();
 
@@ -212,25 +213,33 @@ private static IEnumerator<float> ClearPlayers()
 
         internal static void OnRoundStart()
         {
+            StartGrace = true;
             Restarting = false;
             DidRoundEnd = false;
 
-            SendRequest("00",null);
+            SendRequest("00", "");
+
+            Timing.CallDelayed(10f, () =>
+            {
+                StartGrace = false;
+            });
         }
 
         internal static void OnRoundEnd(RoundEndedEventArgs ev)
         {
             DidRoundEnd = true;
+            StartGrace = false;
 
-            SendRequest("01", null);
+            SendRequest("01", "");
         }
 
         internal static void OnRoundRestart()
         {
             Restarting = true;
+            StartGrace = false;
             if (DidRoundEnd) return;
 
-            SendRequest("01", null);
+            SendRequest("01", "");
         }
 
         internal static void Waiting()
@@ -239,6 +248,7 @@ internal static void Waiting()
 
             Restarting = false;
             DidRoundEnd = false;
+            StartGrace = false;
         }
 
         internal static void OnKill(DyingEventArgs ev)
@@ -254,9 +264,9 @@ internal static void OnKill(DyingEventArgs ev)
 
         internal static void OnRoleChanged(ChangingRoleEventArgs ev)
         {
-            if (!IsPlayerValid(ev.Player, true, false)) return;
+            if ((!RoundSummary.RoundInProgress() && !StartGrace) || !IsPlayerValid(ev.Player, true, false)) return;
 
-            if (!RoundSummary.RoundInProgress() || ev.IsEscaped && !ev.Player.DoNotTrack)
+            if (ev.IsEscaped && !ev.Player.DoNotTrack)
             {
                 SendRequest("07", "{\"playerid\": \""+HandleId(ev.Player.RawUserId)+"\", \"role\": \""+((int) ev.Player.Role).ToString()+"\"}");
             }