Merge pull request #44 from UncomplicatedCustomServer/dev-main

UCR v4.1.1 for EXILED 8.12

UncomplicatedCustomRoles/Commands/LogShare.cs

@@ -32,17 +32,25 @@ protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSe
             }
 
             long Start = DateTimeOffset.Now.ToUnixTimeMilliseconds();
-            response = "Loading the JSON content to share with the developers...";
+            response = $"Loading the JSON content to share with the developers...";
 
             Task.Run(() =>
             {
                 HttpStatusCode Response = LogManager.SendReport(out HttpContent Content);
-                Dictionary<string, string> Data = JsonConvert.DeserializeObject<Dictionary<string, string>>(Plugin.HttpManager.RetriveString(Content));
-
-                if (Response is HttpStatusCode.OK && Data.ContainsKey("id"))
-                    Log.Info($"[ShareTheLog] Successfully shared the UCR logs with the developers!\nSend this Id to the developers: {Data["id"]}\n\nTook {DateTimeOffset.Now.ToUnixTimeMilliseconds() - Start}ms");
-                else
-                    Log.Info($"Failed to share the UCR logs with the developers: Server says: {Response}");
+                try
+                {
+                    if (Response is HttpStatusCode.OK)
+                    {
+                        Dictionary<string, string> Data = JsonConvert.DeserializeObject<Dictionary<string, string>>(Plugin.HttpManager.RetriveString(Content));
+                        Log.Info($"[ShareTheLog] Successfully shared the UCR logs with the developers!\nSend this Id to the developers: {Data["id"]}\n\nTook {DateTimeOffset.Now.ToUnixTimeMilliseconds() - Start}ms");
+                    } 
+                    else
+                        Log.Info($"Failed to share the UCR logs with the developers: Server says: {Response}");
+                }
+                catch (Exception e) 
+                { 
+                    Log.Error(e.ToString()); 
+                }
             });
 
 

UncomplicatedCustomRoles/Events/EventHandler.cs

@@ -24,14 +24,35 @@ internal class EventHandler
     {
         private static List<int> RagdollAppearanceQueue { get; } = new();
 
+        private static List<int> FirstRoundPlayers { get; } = new();
+
+        private static bool Initialized { get; set; } = false;
+
+        public void OnWaitingForPlayers()
+        {
+            Plugin.Instance.OnFinishedLoadingPlugins();
+
+        }
+
         public void OnRoundStarted()
         {
+            Initialized = true;
+            FirstRoundPlayers.Clear();
+
             // Starts the infinite effect thing
             InfiniteEffect.Stop();
             InfiniteEffect.EffectAssociationAllowed = true;
             InfiniteEffect.Start();
         }
 
+        public void OnVerified(VerifiedEventArgs ev)
+        {
+            if (Initialized)
+                return;
+
+            FirstRoundPlayers.Add(ev.Player.Id);
+        }
+
         public void OnInteractingScp330(InteractingScp330EventArgs ev)
         {
             if (!ev.IsAllowed)
@@ -137,31 +158,29 @@ public void OnChangingRole(ChangingRoleEventArgs ev)
             if (ev.NewRole is RoleTypeId.Spectator || ev.NewRole is RoleTypeId.None || ev.NewRole is RoleTypeId.Filmmaker)
                 return;
 
-            LogManager.Debug("Called CHANGINGROLE event");
-
             if (Spawn.Spawning.Contains(ev.Player.Id))
                 return;
 
             if (ev.Player.HasCustomRole())
                 return;
 
+
             if (ev.Player.IsNPC)
                 return;
 
-            string LogReason = string.Empty;
-            if (Plugin.Instance.Config.AllowOnlyNaturalSpawns && !Spawn.SpawnQueue.Contains(ev.Player.Id))
-            {
-                LogManager.Debug("The player is not in the queue for respawning!");
-                return;
-            }
-            else if (Spawn.SpawnQueue.Contains(ev.Player.Id))
+            if (!FirstRoundPlayers.Contains(ev.Player.Id))
             {
-                Spawn.SpawnQueue.Remove(ev.Player.Id);
-                LogReason = " [WITH a respawn wave - VANILLA]";
+                if (Plugin.Instance.Config.AllowOnlyNaturalSpawns && !Spawn.SpawnQueue.Contains(ev.Player.Id))
+                {
+                    LogManager.Debug("The player is not in the queue for respawning!");
+                    return;
+                }
+                else if (Spawn.SpawnQueue.Contains(ev.Player.Id))
+                {
+                    Spawn.SpawnQueue.Remove(ev.Player.Id);
+                }
             }
 
-            LogManager.Debug($"Player {ev.Player.Nickname} spawned{LogReason}, going to assign a role if needed!");
-
             ICustomRole Role = SpawnManager.DoEvaluateSpawnForPlayer(ev.Player, ev.NewRole);
 
             if (Role is not null)

UncomplicatedCustomRoles/Manager/LogManager.cs

@@ -55,20 +55,20 @@ internal static HttpStatusCode SendReport(out HttpContent content)
             if (History.Count < 1)
                 return HttpStatusCode.Forbidden;
 
-            string Content = string.Empty;
+            string stringContent = string.Empty;
 
             foreach (LogEntry Element in History)
-                Content += $"{Element}\n";
+                stringContent += $"{Element}\n";
 
             // Now let's add the separator
-            Content += "\n======== BEGIN CUSTOM ROLES ========\n";
+            stringContent += "\n======== BEGIN CUSTOM ROLES ========\n";
 
             foreach (ICustomRole Role in CustomRole.CustomRoles.Values)
             {
-                Content += $"{Loader.Serializer.Serialize(Role)}\n\n---\n\n";
+                stringContent += $"{Loader.Serializer.Serialize(Role)}\n\n---\n\n";
             }
 
-            HttpStatusCode Response = Plugin.HttpManager.ShareLogs(Content, out _);
+            HttpStatusCode Response = Plugin.HttpManager.ShareLogs(stringContent, out content);
 
             if (Response is HttpStatusCode.OK)
             {

UncomplicatedCustomRoles/Manager/NET/HttpManager.cs

@@ -43,7 +43,7 @@ internal class HttpManager
         /// <summary>
         /// Gets the UCS APIs endpoint
         /// </summary>
-        public string Endpoint { get; } = "https://api.ucserver.it";
+        public string Endpoint { get; } = "https://api.ucserver.it/v2";
 
         /// <summary>
         /// Gets the CreditTag storage for the plugin, downloaded from our central server
@@ -171,7 +171,7 @@ public void LoadCreditTags()
             Credits = new();
             try
             {
-                Dictionary<string, Dictionary<string, string>> Data = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, string>>>(RetriveString(HttpGetRequest("https://ucs.fcosma.it/api/credits.json")));
+                Dictionary<string, Dictionary<string, string>> Data = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, string>>>(RetriveString(HttpGetRequest("https://api.ucserver.it/credits.json")));
 
                 if (Data is null)
                 {

UncomplicatedCustomRoles/Manager/SpawnManager.cs

@@ -248,6 +248,9 @@ public static void SummonSubclassApplier(Player Player, ICustomRole Role)
             if (Spawn.Spawning.Contains(Player.Id))
                 Spawn.Spawning.Remove(Player.Id);
 
+            if (API.Features.Escape.Bucket.Contains(Player.Id))
+                API.Features.Escape.Bucket.Remove(Player.Id);
+
             LogManager.Debug($"{Player} successfully spawned as {Role.Name} ({Role.Id})! [2VDS]");
         }
 

UncomplicatedCustomRoles/Patches/ServerNamePatch.cs

@@ -5,6 +5,6 @@ namespace UncomplicatedCustomRoles.Patches
     [HarmonyPatch(typeof(ServerConsole), nameof(ServerConsole.ReloadServerName))]
     internal class ServerNamePatch
     {
-        private static void Postfix() => ServerConsole._serverName += $"<color=#000000><size=1>UCR {Plugin.Instance.Version.ToString(3)}</size></color>";
+        private static void Postfix() => ServerConsole._serverName += $"<color=#00000000><size=1>UCR {Plugin.Instance.Version.ToString(3)}</size></color>";
     }
 }

UncomplicatedCustomRoles/Plugin.cs

@@ -27,7 +27,7 @@ internal class Plugin : Plugin<Config>
 
         public override string Author => "FoxWorn3365, Dr.Agenda";
 
-        public override Version Version { get; } = new(4, 1, 0);
+        public override Version Version { get; } = new(4, 1, 1);
 
         public override Version RequiredExiledVersion { get; } = new(8, 11, 0);
 
@@ -60,8 +60,8 @@ public override void OnEnabled()
             ServerHandler.RespawningTeam += Handler.OnRespawningWave;
             ServerHandler.RoundStarted += Handler.OnRoundStarted;
             ServerHandler.RoundEnded += Handler.OnRoundEnded;
+            ServerHandler.WaitingForPlayers += Handler.OnWaitingForPlayers;
 
-            // PlayerHandler.Verified += Handler.OnVerified;
             PlayerHandler.ActivatingGenerator += Handler.OnGenerator;
             PlayerHandler.Dying += Handler.OnDying;
             PlayerHandler.Died += Handler.OnDied;
@@ -77,6 +77,7 @@ public override void OnEnabled()
             PlayerHandler.TriggeringTesla += Handler.OnTriggeringTeslaGate;
             PlayerHandler.MakingNoise += Handler.OnMakingNoise;
             PlayerHandler.PickingUpItem += Handler.OnPickingUp;
+            PlayerHandler.Verified += Handler.OnVerified;
 
             Scp049Handler.FinishingRecall += Handler.OnFinishingRecall;
 
@@ -147,6 +148,7 @@ public override void OnDisabled()
             ServerHandler.RespawningTeam -= Handler.OnRespawningWave;
             ServerHandler.RoundEnded -= Handler.OnRoundEnded;
             ServerHandler.RoundStarted -= Handler.OnRoundStarted;
+            ServerHandler.WaitingForPlayers -= Handler.OnWaitingForPlayers;
 
             // PlayerHandler.Verified -= Handler.OnVerified;
             PlayerHandler.ActivatingGenerator -= Handler.OnGenerator;
@@ -164,6 +166,7 @@ public override void OnDisabled()
             PlayerHandler.TriggeringTesla -= Handler.OnTriggeringTeslaGate;
             PlayerHandler.MakingNoise -= Handler.OnMakingNoise;
             PlayerHandler.PickingUpItem -= Handler.OnPickingUp;
+            PlayerHandler.Verified -= Handler.OnVerified;
 
             Scp049Handler.FinishingRecall -= Handler.OnFinishingRecall;
 

UncomplicatedCustomRoles/UncomplicatedCustomRoles.csproj

@@ -116,7 +116,6 @@
     <Compile Include="Patches\InventoryLimitsPrefix.cs" />
     <Compile Include="Patches\DisabledEventPatch.cs" />
     <Compile Include="Patches\PlayerInfoPatch.cs" />
-    <Compile Include="Patches\PluginsLoaded.cs" />
     <Compile Include="Patches\Scp3114StranglePrefix.cs" />
     <Compile Include="Patches\ServerNamePatch.cs" />
     <Compile Include="Patches\SetRolePatch.cs" />