fix: Custom Weapons Ammo Limit / Reloading & Unloading Events

EXILED/Exiled.CustomItems/API/Features/CustomWeapon.cs

@@ -221,7 +221,7 @@ protected virtual void OnChangingAttachment(ChangingAttachmentsEventArgs ev)
 
         private void OnInternalReloading(ReloadingWeaponEventArgs ev)
         {
-            if (!Check(ev.Player.CurrentItem))
+            if (!Check(ev.Item))
                 return;
 
             if (ClipSize > 0 && ev.Firearm.TotalAmmo >= ClipSize)
@@ -266,15 +266,15 @@ private void OnInternalReloaded(ReloadedWeaponEventArgs ev)
 
         private void OnInternalShooting(ShootingEventArgs ev)
         {
-            if (!Check(ev.Player.CurrentItem))
+            if (!Check(ev.Item))
                 return;
 
             OnShooting(ev);
         }
 
         private void OnInternalShot(ShotEventArgs ev)
         {
-            if (!Check(ev.Player.CurrentItem))
+            if (!Check(ev.Item))
                 return;
 
             OnShot(ev);
@@ -340,4 +340,4 @@ private void OnInternalChangingAttachment(ChangingAttachmentsEventArgs ev)
             OnChangingAttachment(ev);
         }
     }
-}
+}

EXILED/Exiled.Events/EventArgs/Player/ReloadingWeaponEventArgs.cs

@@ -20,13 +20,13 @@ public class ReloadingWeaponEventArgs : IPlayerEvent, IFirearmEvent, IDeniableEv
         /// <summary>
         /// Initializes a new instance of the <see cref="ReloadingWeaponEventArgs" /> class.
         /// </summary>
-        /// <param name="firearm">
-        /// <inheritdoc cref="Firearm" />
-        /// </param>
-        public ReloadingWeaponEventArgs(InventorySystem.Items.Firearms.Firearm firearm)
+        /// <param name="firearm">The firearm being reloaded.</param>
+        /// <param name="isAllowed">A value indicating whether the weapon can be reloaded.</param>
+        public ReloadingWeaponEventArgs(InventorySystem.Items.Firearms.Firearm firearm, bool isAllowed)
         {
             Firearm = Item.Get<Firearm>(firearm);
             Player = Firearm.Owner;
+            IsAllowed = isAllowed;
         }
 
         /// <summary>
@@ -47,4 +47,4 @@ public ReloadingWeaponEventArgs(InventorySystem.Items.Firearms.Firearm firearm)
         /// </summary>
         public Player Player { get; }
     }
-}
+}

EXILED/Exiled.Events/EventArgs/Player/UnloadingWeaponEventArgs.cs

@@ -21,12 +21,16 @@ public class UnloadingWeaponEventArgs : IPlayerEvent, IFirearmEvent, IDeniableEv
         /// Initializes a new instance of the <see cref="UnloadingWeaponEventArgs" /> class.
         /// </summary>
         /// <param name="firearm">
-        /// <inheritdoc cref="Firearm" />
+        /// The firearm being unloaded.
         /// </param>
-        public UnloadingWeaponEventArgs(InventorySystem.Items.Firearms.Firearm firearm)
+        /// <param name="isAllowed">
+        /// Indicates whether the weapon unloading is allowed.
+        /// </param>
+        public UnloadingWeaponEventArgs(InventorySystem.Items.Firearms.Firearm firearm, bool isAllowed)
         {
             Firearm = Item.Get<Firearm>(firearm);
             Player = Firearm.Owner;
+            IsAllowed = isAllowed;
         }
 
         /// <summary>
@@ -47,4 +51,4 @@ public UnloadingWeaponEventArgs(InventorySystem.Items.Firearms.Firearm firearm)
         /// </summary>
         public Player Player { get; }
     }
-}
+}

EXILED/Exiled.Events/Events.cs

@@ -89,6 +89,9 @@ public override void OnEnabled()
 
             ServerSpecificSettingsSync.ServerOnSettingValueReceived += SettingBase.OnSettingUpdated;
 
+            LabApi.Events.Handlers.PlayerEvents.ReloadingWeapon += Handlers.Player.OnReloadingWeapon;
+            LabApi.Events.Handlers.PlayerEvents.UnloadingWeapon += Handlers.Player.OnUnloadingWeapon;
+
             ServerConsole.ReloadServerName();
         }
 
@@ -123,6 +126,9 @@ public override void OnDisabled()
             ItemPickupBase.OnPickupDestroyed -= Handlers.Internal.PickupEvent.OnRemovedPickup;
 
             ServerSpecificSettingsSync.ServerOnSettingValueReceived -= SettingBase.OnSettingUpdated;
+
+            LabApi.Events.Handlers.PlayerEvents.ReloadingWeapon -= Handlers.Player.OnReloadingWeapon;
+            LabApi.Events.Handlers.PlayerEvents.UnloadingWeapon -= Handlers.Player.OnUnloadingWeapon;
         }
 
         /// <summary>

EXILED/Exiled.Events/Handlers/Player.cs

@@ -16,6 +16,7 @@ namespace Exiled.Events.Handlers
     using Exiled.Events.EventArgs.Player;
 
     using Exiled.Events.Features;
+    using LabApi.Events.Arguments.PlayerEvents;
 
     /// <summary>
     /// Player related events.
@@ -884,7 +885,12 @@ public class Player
         /// Called before a <see cref="API.Features.Player"/> reloads a weapon.
         /// </summary>
         /// <param name="ev">The <see cref="ReloadingWeaponEventArgs"/> instance.</param>
-        public static void OnReloadingWeapon(ReloadingWeaponEventArgs ev) => ReloadingWeapon.InvokeSafely(ev);
+        public static void OnReloadingWeapon(PlayerReloadingWeaponEventArgs ev)
+        {
+            ReloadingWeaponEventArgs exiledEv = new(ev.FirearmItem.Base, ev.IsAllowed);
+            ReloadingWeapon.InvokeSafely(exiledEv);
+            ev.IsAllowed = exiledEv.IsAllowed;
+        }
 
         /// <summary>
         /// Called after a <see cref="API.Features.Player"/> reloads a weapon.
@@ -992,7 +998,12 @@ public class Player
         /// Called before a <see cref="API.Features.Player"/> unloads a weapon.
         /// </summary>
         /// <param name="ev">The <see cref="UnloadingWeaponEventArgs"/> instance.</param>
-        public static void OnUnloadingWeapon(UnloadingWeaponEventArgs ev) => UnloadingWeapon.InvokeSafely(ev);
+        public static void OnUnloadingWeapon(PlayerUnloadingWeaponEventArgs ev)
+        {
+            UnloadingWeaponEventArgs exiledEv = new(ev.FirearmItem.Base, ev.IsAllowed);
+            UnloadingWeapon.InvokeSafely(exiledEv);
+            ev.IsAllowed = exiledEv.IsAllowed;
+        }
 
         /// <summary>
         /// Called after a <see cref="API.Features.Player"/> unloads a weapon.