Small fixes

Author: Mr-Baguetter

UncomplicatedCustomItems.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 18
-VisualStudioVersion = 18.0.11010.61 d18.0
+VisualStudioVersion = 18.0.11010.61
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UncomplicatedCustomItems", "UncomplicatedCustomItems\UncomplicatedCustomItems.csproj", "{B39EE633-0EFE-42FC-B3E8-C6C4C86029E5}"
 EndProject

UncomplicatedCustomItems/API/Features/Manager/HttpManager.cs

@@ -2,6 +2,7 @@
 using Exiled.API.Interfaces;
 using Exiled.Loader;
 #endif
+using CentralAuth;
 using LabApi.Events.Arguments.PlayerEvents;
 using LabApi.Features;
 using LabApi.Features.Wrappers;
@@ -329,6 +330,9 @@ internal HttpStatusCode ShareLogs(string data, out HttpContent httpContent)
         /// </summary>
         public void StartPresence(int intervalSeconds = 60)
         {
+            if (!CustomNetworkManager.IsVerified || !PlayerAuthenticationManager.OnlineMode || CentralServer.Abort)
+                return;
+
             LogManager.Debug("Starting UCI API Presence");
             if (string.IsNullOrWhiteSpace(UCIAPIEndpoint))
                 throw new ArgumentException("Presence Worker Url required", nameof(UCIAPIEndpoint));
@@ -385,7 +389,7 @@ private async Task TrackPresenceResult(Task<bool> presenceTask)
             try
             {
                 bool success = await presenceTask;
-
+                
                 if (success)
                 {
                     _presenceFailureCount = 0;
@@ -473,7 +477,7 @@ internal async Task<bool> SendPresenceOnceAsync()
                     showOnList = Plugin.Instance.Config.ShowOnuciList.ToString(),
                     plugins = pluginNames,
                     exiled = hasExiled.ToString().ToLower(),
-                    extra = $"PlayerCount: {Server.PlayerCount}, MaxPlayers: {Server.MaxPlayers}, Idling: {Server.IdleModeActive}"
+                    extra = $"PlayerCount: {Player.ReadyList.Where(p => p.IsReady && p.IsPlayer).Count()}, MaxPlayers: {Server.MaxPlayers}, Idling: {Server.IdleModeActive}"
                 };
 
                 string json = JsonConvert.SerializeObject(payload);

UncomplicatedCustomItems/API/Toolgun/Settings.cs

@@ -23,16 +23,15 @@ public static void GiveToPlayers()
 
             ServerSpecificSettingsSync.SendOnJoinFilter = (_) => false;
             ServerSpecificSettingsSync.DefinedSettings = _settings.ToArray();
-            ServerSpecificSettingsSync.SendToPlayersConditionally(x => Utilities.TryGetSummonedCustomItem(x.inventory.CurInstance.ItemSerial, out var item) && item.HasModule(CustomFlags.ToolGun));
-            Timing.RunCoroutine(ResetSettings());
+            Timing.CallDelayed(1, () => ServerSpecificSettingsSync.SendToPlayersConditionally(x => Utilities.TryGetSummonedCustomItem(x.inventory.CurInstance.ItemSerial, out var item) && item.HasModule(CustomFlags.ToolGun)));
         }
 
         internal static IEnumerator<float> ResetSettings()
         {
             for (; ; )
             {
                 ResetPlayer();
-                yield return 5f;
+                yield return 1f;
             }
         }
 

UncomplicatedCustomItems/API/Utilities.cs

@@ -42,7 +42,7 @@ public static bool CustomItemValidator(ICustomItem item, out string error)
                 case CustomItemType.Item:
                     if (item.CustomData is null)
                     {
-                    error = $"The item has been flagged as 'Item' but the CustomData class is not 'IData', found '{item.CustomData.GetType().Name}' The CustomData formatting is incorrect. \n Please follow the format found here: https://discord.com/channels/1170301876990914631/1339667038750244979";
+                        error = $"The item has been flagged as 'Item' but the CustomData class is not 'IData', found '{item.CustomData.GetType().Name}' The CustomData formatting is incorrect. \n Please follow the format found here: https://discord.com/channels/1170301876990914631/1339667038750244979";
                         return false;
                     }
 

UncomplicatedCustomItems/Commands/Admin/ToolGun.cs

@@ -27,7 +27,7 @@ public bool Execute(List<string> arguments, ICommandSender sender, out string re
 
             if (arguments.Count == 1)
             {
-                Player target = Player.Get(arguments[0]);
+                Player target = Player.Get(int.Parse(arguments[0]));
                 if (target is null)
                 {
                     response = "Player not found!";

UncomplicatedCustomItems/Intergrations/MER.cs

@@ -29,10 +29,11 @@ public static void Init()
                 {
                     Found = true;
                     plugin.TryGetLoadedAssembly(out MERAssembly);
+                    break;
                 }
             }
 
-            if (Found)
+            if (Found && MERAssembly != null)
             {
                 LogManager.Silent($"MER Found! :D");
                 Register();
@@ -49,7 +50,7 @@ private static void Register()
                     LogManager.Debug($"MER SchematicSpawned Event Triggered");
                     string name = obj?.GetType().GetProperty("Name")?.GetValue(obj)?.ToString() ?? "<unknown>";
                     object schematicObject = obj?.GetType().GetProperty("Schematic")?.GetValue(obj);
-                    
+
                     foreach (CustomItem item in CustomItem.List)
                     {
                         if (item.HasModule(CustomFlags.MERSpawn))
@@ -86,7 +87,7 @@ private static void Register()
 
         internal static void Unregister()
         {
-            EventToken.Unregister();
+            EventToken?.Unregister();
         }
 
         private static List<Locker> GetLockers(object schematicObj)

UncomplicatedCustomItems/Plugin.cs

@@ -26,6 +26,8 @@
 // Events
 using PlayerEvent = LabApi.Events.Handlers.PlayerEvents;
 using ServerEvent = LabApi.Events.Handlers.ServerEvents;
+using MEC;
+using UncomplicatedCustomItems.API.ToolGun;
 
 // Building for remote development. You can ignore this :)
 // & "C:\Program Files\Microsoft Visual Studio\18\Insiders\MSBuild\Current\Bin\MSBuild.exe" UncomplicatedCustomItems.csproj /p:Configuration=LabApi
@@ -44,7 +46,7 @@ public class Plugin : Plugin<Config>
 #endif
         public override string Author => "SpGerg, FoxWorn & Mr. Baguetter";
 #if EXILED
-        public override Version RequiredExiledVersion { get; } = new(9, 8, 1);
+        public override Version RequiredExiledVersion { get; } = new(9, 9, 1);
 #else
         public override Version RequiredApiVersion { get; } = LabApi.Features.LabApiProperties.CurrentVersion;
 #endif
@@ -252,6 +254,7 @@ public override void Disable()
             base.OnDisabled();
 #endif
         }
+        
         public void OnFinishedLoading()
         {
             HttpManager.StartPresence();
@@ -265,6 +268,7 @@ public void OnFinishedLoading()
             LabAPIExtensions.Init();
             MERIntergration.Init();
             ECRIntegration.Init();
+            Timing.RunCoroutine(Settings.ResetSettings());
 #if EXILED
             CommonUtilitiesPatch.Initialize();
 #endif

UncomplicatedCustomItems/UncomplicatedCustomItems.csproj

@@ -102,21 +102,21 @@
     </Reference>
     <Reference Include="0Harmony, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Downloads\EXILED_REFERENCES\0Harmony.dll</HintPath>
+      <HintPath>$(EXILED_REFERENCES)\0Harmony.dll</HintPath>
     </Reference>
     <Reference Include="LabApi-Publicized">
-      <HintPath>..\..\..\..\Downloads\EXILED_REFERENCES\LabApi-Publicized.dll</HintPath>
+      <HintPath>$(EXILED_REFERENCES)\LabApi-Publicized.dll</HintPath>
     </Reference>
     <Reference Include="Mirror-Publicized">
-      <HintPath>..\..\..\..\Downloads\EXILED_REFERENCES\Mirror-Publicized.dll</HintPath>
+      <HintPath>$(EXILED_REFERENCES)\Mirror-Publicized.dll</HintPath>
     </Reference>
     <Reference Include="NorthwoodLib, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(EXILED_REFERENCES)\NorthwoodLib.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp-Publicized, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Downloads\Release\Assembly-CSharp-Publicized.dll</HintPath>
+      <HintPath>$(EXILED_REFERENCES)\Assembly-CSharp-Publicized.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -151,10 +151,10 @@
     </Reference>
     <Reference Include="Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Release\Mono.Security.dll</HintPath>
+      <HintPath>$(EXILED_REFERENCES)\Mono.Security.dll</HintPath>
     </Reference>
     <Reference Include="NorthwoodLib">
-      <HintPath>..\..\..\..\Downloads\EXILED_REFERENCES\NorthwoodLib.dll</HintPath>
+      <HintPath>$(EXILED_REFERENCES)\NorthwoodLib.dll</HintPath>
     </Reference>
     <Reference Include="NVorbis">
       <HintPath>$(EXILED_REFERENCES)\NVorbis.dll</HintPath>