3.5.3

Mr-Baguetter · Mr-Baguetter · commit 1ff5dd71aaa4 · 2025-06-13T11:23:49.000-05:00
diff --git a/UncomplicatedCustomItems/API/Extensions/PlayerExtensions.cs b/UncomplicatedCustomItems/API/Extensions/PlayerExtensions.cs
diff --git a/UncomplicatedCustomItems/API/Wrappers/SSS.cs b/UncomplicatedCustomItems/API/Wrappers/SSS.cs
@@ -22,7 +22,7 @@ public static void AddOrUpdateUserSetting(ReferenceHub user, ServerSpecificSetti
 
             userSettings.Add(setting);
         }
-
+        
         public static void AddToolGunSettingsToUser(ReferenceHub user)
         {
             List<ServerSpecificSettingBase> userSettings = ServerSpecificSettingsSync.ReceivedUserSettings.GetOrAddNew(user);
diff --git a/UncomplicatedCustomItems/Events/PlayerHandler.cs b/UncomplicatedCustomItems/Events/PlayerHandler.cs
@@ -24,7 +24,6 @@
 using Exiled.API.Features.Items;
 using CustomPlayerEffects;
 using Exiled.API.Features;
-using Exiled.CustomItems.API.Features;
 
 namespace UncomplicatedCustomItems.Events
 {
@@ -808,17 +807,14 @@ public static void OnDoorInteracting(InteractingDoorEventArgs ev)
                     IKeycardData Data = CustomItem.CustomItem.CustomData as IKeycardData;
                     Timing.CallDelayed(0.1f, () =>
                     {
-                        if (ev.Player.HasKeycardPermission((KeycardPermissions)ev.Door.RequiredPermissions))
+                        if (ev.Door.Base.IsMoving && Data.OneTimeUse)
                         {
-                            if (Data.OneTimeUse)
+                            Timing.CallDelayed(0.5f, () =>
                             {
-                                Timing.CallDelayed(0.5f, () =>
-                                {
-                                    ev.Player.ShowHint($"{Data.OneTimeUseHint.Replace("%name%", CustomItem.CustomItem.Name)}", 8f);
-                                    LogManager.Debug($"OneTimeUse is true removing {CustomItem.CustomItem.Name}...");
-                                    ev.Player.RemoveItem(CustomItem.Item, true);
-                                });
-                            }
+                                ev.Player.ShowHint($"{Data.OneTimeUseHint.Replace("%name%", CustomItem.CustomItem.Name)}", 8f);
+                                LogManager.Debug($"OneTimeUse is true removing {CustomItem.CustomItem.Name}...");
+                                ev.Player.RemoveItem(CustomItem.Item, true);
+                            });
                         }
                     });
                 }
@@ -859,18 +855,15 @@ public static void OnLockerInteracting(InteractingLockerEventArgs ev)
             {
                 if (CustomItem.CustomItem.CustomItemType == CustomItemType.Keycard)
                 {
-                    if (ev.Player.HasKeycardPermission(ev.InteractingChamber.RequiredPermissions))
+                    IKeycardData Data = CustomItem.CustomItem.CustomData as IKeycardData;
+                    if (ev.InteractingChamber.IsOpen && Data.OneTimeUse)
                     {
-                        IKeycardData Data = CustomItem.CustomItem.CustomData as IKeycardData;
-                        if (Data.OneTimeUse)
+                        Timing.CallDelayed(0.5f, () =>
                         {
-                            Timing.CallDelayed(0.5f, () =>
-                            {
-                                ev.Player.ShowHint($"{Data.OneTimeUseHint.Replace("%name%", CustomItem.CustomItem.Name)}", 8f);
-                                LogManager.Debug($"OneTimeUse is true removing {CustomItem.CustomItem.Name}...");
-                                ev.Player.RemoveItem(CustomItem.Item, true);
-                            });
-                        }
+                            ev.Player.ShowHint($"{Data.OneTimeUseHint.Replace("%name%", CustomItem.CustomItem.Name)}", 8f);
+                            LogManager.Debug($"OneTimeUse is true removing {CustomItem.CustomItem.Name}...");
+                            ev.Player.RemoveItem(CustomItem.Item, true);
+                        });
                     }
                 }
             }
diff --git a/UncomplicatedCustomItems/Plugin.cs b/UncomplicatedCustomItems/Plugin.cs
@@ -84,7 +84,7 @@ public override void OnEnabled()
             _playerSettings =
             [
                 new SSGroupHeader("CustomItem Settings"),
-                new SSKeybindSetting(20, "Trigger CustomItem", KeyCode.K, hint: "When pressed this will trigger the CustomItem your holding")
+                new SSKeybindSetting(20, "Trigger CustomItem", KeyCode.K, hint: "When pressed this will trigger the CustomItem your holding", allowSpectatorTrigger: false)
             ];
             _DebugSettings =
             [
@@ -100,7 +100,7 @@ public override void OnEnabled()
                 new SSTextArea(29, "Default Message"),
 
                 new SSGroupHeader("CustomItem Settings"),
-                new SSKeybindSetting(20, "Trigger CustomItem", KeyCode.K, hint: "When pressed this will trigger the CustomItem your holding")
+                new SSKeybindSetting(20, "Trigger CustomItem", KeyCode.K, hint: "When pressed this will trigger the CustomItem your holding", allowSpectatorTrigger: false)
             ];
 
             ServerSpecificSettingsSync.DefinedSettings = _settings.ToArray();
diff --git a/UncomplicatedCustomItems/UncomplicatedCustomItems.csproj b/UncomplicatedCustomItems/UncomplicatedCustomItems.csproj
@@ -53,6 +53,7 @@
     <ErrorReport>prompt</ErrorReport>
     <DocumentationFile>bin\x64\Release\UncomplicatedCustomItems.xml</DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="0Harmony, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
@@ -100,6 +101,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(EXILED_REFERENCES)\Pooling.dll</HintPath>
     </Reference>
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -536,7 +538,6 @@
     <Compile Include="API\Extensions\HarmonyExtensions.cs" />
     <Compile Include="API\Extensions\ItemExtensions.cs" />
     <Compile Include="API\Extensions\PickupExtensions.cs" />
-    <Compile Include="API\Extensions\PlayerExtensions.cs" />
     <Compile Include="API\Extensions\StringExtensions.cs" />
     <Compile Include="API\Extensions\Vector3Extensions.cs" />
     <Compile Include="HarmonyElements\Patches\ServerNamePatch.cs" />
@@ -586,14 +587,11 @@
   <ItemGroup />
   <ItemGroup>
     <PackageReference Include="ExMod.Exiled">
-      <Version>9.6.0</Version>
+      <Version>9.6.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageReference>
-    <PackageReference Include="Northwood.LabAPI">
-      <Version>1.0.2</Version>
-    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public static void AddOrUpdateUserSetting(ReferenceHub user, ServerSpecificSetti`
`22`	`22`
`23`	`23`	`userSettings.Add(setting);`
`24`	`24`	`}`
`25`		`-`
	`25`	`+`
`26`	`26`	`public static void AddToolGunSettingsToUser(ReferenceHub user)`
`27`	`27`	`{`
`28`	`28`	`List<ServerSpecificSettingBase> userSettings = ServerSpecificSettingsSync.ReceivedUserSettings.GetOrAddNew(user);`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`using Exiled.API.Features.Items;`
`25`	`25`	`using CustomPlayerEffects;`
`26`	`26`	`using Exiled.API.Features;`
`27`		`-using Exiled.CustomItems.API.Features;`
`28`	`27`
`29`	`28`	`namespace UncomplicatedCustomItems.Events`
`30`	`29`	`{`
`@@ -808,17 +807,14 @@ public static void OnDoorInteracting(InteractingDoorEventArgs ev)`
`808`	`807`	`IKeycardData Data = CustomItem.CustomItem.CustomData as IKeycardData;`
`809`	`808`	`Timing.CallDelayed(0.1f, () =>`
`810`	`809`	`{`
`811`		`- if (ev.Player.HasKeycardPermission((KeycardPermissions)ev.Door.RequiredPermissions))`
	`810`	`+ if (ev.Door.Base.IsMoving && Data.OneTimeUse)`
`812`	`811`	`{`
`813`		`- if (Data.OneTimeUse)`
	`812`	`+ Timing.CallDelayed(0.5f, () =>`
`814`	`813`	`{`
`815`		`- Timing.CallDelayed(0.5f, () =>`
`816`		`- {`
`817`		`- ev.Player.ShowHint($"{Data.OneTimeUseHint.Replace("%name%", CustomItem.CustomItem.Name)}", 8f);`
`818`		`- LogManager.Debug($"OneTimeUse is true removing {CustomItem.CustomItem.Name}...");`
`819`		`- ev.Player.RemoveItem(CustomItem.Item, true);`
`820`		`- });`
`821`		`- }`
	`814`	`+ ev.Player.ShowHint($"{Data.OneTimeUseHint.Replace("%name%", CustomItem.CustomItem.Name)}", 8f);`
	`815`	`+ LogManager.Debug($"OneTimeUse is true removing {CustomItem.CustomItem.Name}...");`
	`816`	`+ ev.Player.RemoveItem(CustomItem.Item, true);`
	`817`	`+ });`
`822`	`818`	`}`
`823`	`819`	`});`
`824`	`820`	`}`
`@@ -859,18 +855,15 @@ public static void OnLockerInteracting(InteractingLockerEventArgs ev)`
`859`	`855`	`{`
`860`	`856`	`if (CustomItem.CustomItem.CustomItemType == CustomItemType.Keycard)`
`861`	`857`	`{`
`862`		`- if (ev.Player.HasKeycardPermission(ev.InteractingChamber.RequiredPermissions))`
	`858`	`+ IKeycardData Data = CustomItem.CustomItem.CustomData as IKeycardData;`
	`859`	`+ if (ev.InteractingChamber.IsOpen && Data.OneTimeUse)`
`863`	`860`	`{`
`864`		`- IKeycardData Data = CustomItem.CustomItem.CustomData as IKeycardData;`
`865`		`- if (Data.OneTimeUse)`
	`861`	`+ Timing.CallDelayed(0.5f, () =>`
`866`	`862`	`{`
`867`		`- Timing.CallDelayed(0.5f, () =>`
`868`		`- {`
`869`		`- ev.Player.ShowHint($"{Data.OneTimeUseHint.Replace("%name%", CustomItem.CustomItem.Name)}", 8f);`
`870`		`- LogManager.Debug($"OneTimeUse is true removing {CustomItem.CustomItem.Name}...");`
`871`		`- ev.Player.RemoveItem(CustomItem.Item, true);`
`872`		`- });`
`873`		`- }`
	`863`	`+ ev.Player.ShowHint($"{Data.OneTimeUseHint.Replace("%name%", CustomItem.CustomItem.Name)}", 8f);`
	`864`	`+ LogManager.Debug($"OneTimeUse is true removing {CustomItem.CustomItem.Name}...");`
	`865`	`+ ev.Player.RemoveItem(CustomItem.Item, true);`
	`866`	`+ });`
`874`	`867`	`}`
`875`	`868`	`}`
`876`	`869`	`}`