From 88c662027a4a4ab61e79c79ba34942c08fb1ab89 Mon Sep 17 00:00:00 2001
From: PintTheDragon <PintTheDragon@hotmail.com>
Date: Wed, 11 Nov 2020 00:26:59 -0800
Subject: [PATCH] Fix bugs with booster integration

---
 SCPStats/EventHandler.cs            | 20 +++++++++-----------
 SCPStats/Properties/AssemblyInfo.cs |  4 ++--
 SCPStats/SCPStats.cs                |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/SCPStats/EventHandler.cs b/SCPStats/EventHandler.cs
index b1512eb..c9c245e 100644
--- a/SCPStats/EventHandler.cs
+++ b/SCPStats/EventHandler.cs
@@ -193,17 +193,18 @@ private static async Task CreateConnection(int delay = 0)
                             Pinged = false;
                             break;
                     }
-
-                    if (e.Data == null || !e.Data.StartsWith("u")) return;
+                    
+                    if (e.Data == null || !e.Data.StartsWith("u") || SCPStats.Singleton.Config.BoosterRole.Equals("fill this")) return;
                     
                     var data = e.Data.Substring(1).Split(' ');
-                        
+
                     if (data[1] != "1") return;
                     foreach (var player in Player.List)
                     {
-                        if (HandleId(player.RawUserId) != data[0]) continue;
-                                
-                        player.GameObject.GetComponent<ServerRoles>().SetGroup(ServerStatic.PermissionsHandler.GetGroup(SCPStats.Singleton.Config.BoosterRole), false, false, false);
+                        if (!HandleId(player.RawUserId).Equals(data[0])) continue;
+                        if (player.RankName != "") continue;
+
+                        player.ReferenceHub.serverRoles.SetGroup(ServerStatic.PermissionsHandler.GetGroup(SCPStats.Singleton.Config.BoosterRole), false, false, false);
                     }
                 };
 
@@ -216,11 +217,8 @@ private static async Task CreateConnection(int delay = 0)
 
                 ws.OnError += (sender, e) =>
                 {
-                    Log.Warn("An error occured in SCPStats. Reconnecting in 10 seconds...");
+                    Log.Warn("An error occured in SCPStats:");
                     Log.Warn(e.Message);
-
-                    ws?.CloseAsync();
-                    CreateConnection(10000);
                 };
                 
                 ws.Connect();
@@ -394,7 +392,7 @@ internal static void OnDrop(DroppingItemEventArgs ev)
 
         internal static void OnJoin(JoinedEventArgs ev)
         {
-            SendRequest("11", HandleId(ev.Player.RawUserId));
+            Timing.CallDelayed(1f, () => SendRequest("11", HandleId(ev.Player.RawUserId)));
             
             if (!Round.IsStarted && Players.Contains(ev.Player.RawUserId) || ev.Player.DoNotTrack) return;
 
diff --git a/SCPStats/Properties/AssemblyInfo.cs b/SCPStats/Properties/AssemblyInfo.cs
index 18a26ce..f5257b4 100644
--- a/SCPStats/Properties/AssemblyInfo.cs
+++ b/SCPStats/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.3")]
-[assembly: AssemblyFileVersion("1.1.3")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.1.4")]
+[assembly: AssemblyFileVersion("1.1.4")]
\ No newline at end of file
diff --git a/SCPStats/SCPStats.cs b/SCPStats/SCPStats.cs
index 64aa7e0..5dee243 100644
--- a/SCPStats/SCPStats.cs
+++ b/SCPStats/SCPStats.cs
@@ -9,7 +9,7 @@ public class SCPStats : Plugin<Config>
     {
         public override string Name { get; } = "ScpStats";
         public override string Author { get; } = "PintTheDragon";
-        public override Version Version { get; } = new Version(1, 1, 3);
+        public override Version Version { get; } = new Version(1, 1, 4);
         public override PluginPriority Priority { get; } = PluginPriority.Last;
 
         internal static SCPStats Singleton;