feat: DroppingAmmo, DroppedAmmo and InteractingDoor

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

@@ -834,7 +834,8 @@ internal bool TryUnregister()
         protected virtual void SubscribeEvents()
         {
             Exiled.Events.Handlers.Player.Dying += OnInternalOwnerDying;
-            Exiled.Events.Handlers.Player.DroppingItem += OnInternalDropping;
+            Exiled.Events.Handlers.Player.DroppingItem += OnInternalDroppingItem;
+            Exiled.Events.Handlers.Player.DroppingAmmo += OnInternalDroppingAmmo;
             Exiled.Events.Handlers.Player.ChangingItem += OnInternalChanging;
             Exiled.Events.Handlers.Player.Escaping += OnInternalOwnerEscaping;
             Exiled.Events.Handlers.Player.PickingUpItem += OnInternalPickingUp;
@@ -852,7 +853,8 @@ protected virtual void SubscribeEvents()
         protected virtual void UnsubscribeEvents()
         {
             Exiled.Events.Handlers.Player.Dying -= OnInternalOwnerDying;
-            Exiled.Events.Handlers.Player.DroppingItem -= OnInternalDropping;
+            Exiled.Events.Handlers.Player.DroppingItem -= OnInternalDroppingItem;
+            Exiled.Events.Handlers.Player.DroppingAmmo -= OnInternalDroppingAmmo;
             Exiled.Events.Handlers.Player.ChangingItem -= OnInternalChanging;
             Exiled.Events.Handlers.Player.Escaping -= OnInternalOwnerEscaping;
             Exiled.Events.Handlers.Player.PickingUpItem -= OnInternalPickingUp;
@@ -900,7 +902,15 @@ protected virtual void OnOwnerHandcuffing(OwnerHandcuffingEventArgs ev)
         /// Handles tracking items when they are dropped by a player.
         /// </summary>
         /// <param name="ev"><see cref="DroppingItemEventArgs"/>.</param>
-        protected virtual void OnDropping(DroppingItemEventArgs ev)
+        protected virtual void OnDroppingItem(DroppingItemEventArgs ev)
+        {
+        }
+
+        /// <summary>
+        /// Handles tracking custom ammo if <see cref="AmmoType.None"/> when player requests their drop.
+        /// </summary>
+        /// <param name="ev"><see cref="DroppingAmmoEventArgs"/>.</param>
+        protected virtual void OnDroppingAmmo(DroppingAmmoEventArgs ev)
         {
         }
 
@@ -1061,12 +1071,20 @@ private void OnInternalOwnerHandcuffing(HandcuffingEventArgs ev)
             }
         }
 
-        private void OnInternalDropping(DroppingItemEventArgs ev)
+        private void OnInternalDroppingItem(DroppingItemEventArgs ev)
         {
             if (!Check(ev.Item))
                 return;
 
-            OnDropping(ev);
+            OnDroppingItem(ev);
+        }
+
+        private void OnInternalDroppingAmmo(DroppingAmmoEventArgs ev)
+        {
+            if (ev.AmmoType != AmmoType.None)
+                return;
+
+            OnDroppingAmmo(ev);
         }
 
         private void OnInternalPickingUp(PickingUpItemEventArgs ev)

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

@@ -11,6 +11,7 @@ namespace Exiled.Events.EventArgs.Player
 
     using API.Enums;
     using API.Features;
+    using Exiled.API.Extensions;
     using Exiled.API.Features.Pickups;
     using Interfaces;
 
@@ -27,23 +28,29 @@ public class DroppedAmmoEventArgs : IPlayerEvent
         /// <param name="player">
         /// <inheritdoc cref="Player" />
         /// </param>
-        /// <param name="ammoType">
-        /// <inheritdoc cref="AmmoType" />
+        /// <param name="itemType">
+        /// <inheritdoc cref="ItemType"/>
         /// </param>
         /// <param name="amount">
         /// <inheritdoc cref="Amount" />
         /// </param>
         /// <param name="ammoPickups">
         /// <inheritdoc cref="AmmoPickups" />
         /// </param>
-        public DroppedAmmoEventArgs(Player player, AmmoType ammoType, ushort amount, List<InventorySystem.Items.Firearms.Ammo.AmmoPickup> ammoPickups)
+        public DroppedAmmoEventArgs(Player player, ItemType itemType, ushort amount, List<InventorySystem.Items.Firearms.Ammo.AmmoPickup> ammoPickups)
         {
             Player = player;
-            AmmoType = ammoType;
+            ItemType = itemType;
+            AmmoType = ItemExtensions.GetAmmoType(itemType);
             Amount = amount;
             AmmoPickups = Pickup.Get<AmmoPickup>(ammoPickups);
         }
 
+        /// <summary>
+        /// Gets the type of dropped item instead of <inheritdoc cref="AmmoType"/>.
+        /// </summary>
+        public ItemType ItemType { get; }
+
         /// <summary>
         /// Gets the type of dropped ammo.
         /// </summary>

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

@@ -9,7 +9,7 @@ namespace Exiled.Events.EventArgs.Player
 {
     using API.Enums;
     using API.Features;
-
+    using Exiled.API.Extensions;
     using Interfaces;
 
     using PlayerRoles;
@@ -27,23 +27,30 @@ public class DroppingAmmoEventArgs : IPlayerEvent, IDeniableEvent
         /// <param name="player">
         /// <inheritdoc cref="Player" />
         /// </param>
-        /// <param name="ammoType">
-        /// <inheritdoc cref="AmmoType" />
+        /// <param name="itemType">
+        /// <inheritdoc cref="ItemType"/>
         /// </param>
         /// <param name="amount">
         /// <inheritdoc cref="int" />
         /// </param>
         /// <param name="isAllowed">
         /// <inheritdoc cref="IsAllowed" />
         /// </param>
-        public DroppingAmmoEventArgs(Player player, AmmoType ammoType, ushort amount, bool isAllowed = true)
+        public DroppingAmmoEventArgs(Player player, byte itemType, ushort amount, bool isAllowed = true)
         {
             Player = player;
-            AmmoType = ammoType;
+            ItemType = (ItemType)itemType;
+            AmmoType = ItemExtensions.GetAmmoType(ItemType);
             Amount = amount;
             IsAllowed = isAllowed;
         }
 
+        /// <summary>
+        /// Gets the type of item being dropped instead of <inheritdoc cref="AmmoType"/>.
+        /// For example, if the plugin gives the player one of the items instead of ammo.
+        /// </summary>
+        public ItemType ItemType { get; }
+
         /// <summary>
         /// Gets the type of ammo being dropped.
         /// </summary>

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

@@ -9,6 +9,7 @@ namespace Exiled.Events.EventArgs.Player
 {
     using API.Features;
     using Exiled.API.Features.Doors;
+    using Interactables;
     using Interactables.Interobjects.DoorUtils;
     using Interfaces;
 
@@ -26,16 +27,21 @@ public class InteractingDoorEventArgs : IPlayerEvent, IDoorEvent, IDeniableEvent
         /// <param name="door">
         /// <inheritdoc cref="Door" />
         /// </param>
+        /// <param name="colliderId">
+        /// <inheritdoc cref="ColliderId"/>
+        /// </param>
         /// <param name="isAllowed">
         /// <inheritdoc cref="IsAllowed" />
         /// </param>
         /// <param name="canInteract">
         /// <inheritdoc cref="CanInteract" />
         /// </param>
-        public InteractingDoorEventArgs(Player player, DoorVariant door, bool isAllowed = true, bool canInteract = true)
+        public InteractingDoorEventArgs(Player player, DoorVariant door, byte colliderId, bool isAllowed = true, bool canInteract = true)
         {
             Player = player;
             Door = Door.Get(door);
+            ColliderId = colliderId;
+            Collider = InteractableCollider.TryGetCollider(door, colliderId, out InteractableCollider interactableCollider) ? interactableCollider : null;
             IsAllowed = isAllowed;
             CanInteract = canInteract;
         }
@@ -51,10 +57,20 @@ public InteractingDoorEventArgs(Player player, DoorVariant door, bool isAllowed
         public bool IsAllowed { get; set; }
 
         /// <summary>
-        /// Gets or sets the <see cref="API.Features.Doors.Door" /> instance.
+        /// Gets or sets the <see cref="API.Features.Doors.Door"/> instance.
         /// </summary>
         public Door Door { get; set; }
 
+        /// <summary>
+        /// Gets the <see cref="InteractableCollider"/> instance that the player interacted with.
+        /// </summary>
+        public InteractableCollider Collider { get; }
+
+        /// <summary>
+        /// Gets the ColliderId of <see cref="InteractableCollider"/> that the player interacted with.
+        /// </summary>
+        public byte ColliderId { get; }
+
         /// <summary>
         /// Gets the player who's interacting with the door.
         /// </summary>

EXILED/Exiled.Events/Patches/Events/Player/DroppingAmmo.cs

@@ -50,17 +50,16 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Ldfld, Field(typeof(Inventory), nameof(Inventory._hub))),
                 new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
-                // ammoType
+                // itemType
                 new(OpCodes.Ldarg_1),
-                new(OpCodes.Call, Method(typeof(API.Extensions.ItemExtensions), nameof(API.Extensions.ItemExtensions.GetAmmoType))),
 
                 // amount
                 new(OpCodes.Ldarg_2),
 
                 // true
                 new(OpCodes.Ldc_I4_1),
 
-                // DroppingAmmoEventArgs ev = new(Player, AmmoType, ushort, bool)
+                // DroppingAmmoEventArgs ev = new(Player, ItemType, ushort, bool)
                 new(OpCodes.Newobj, GetDeclaredConstructors(typeof(DroppingAmmoEventArgs))[0]),
                 new(OpCodes.Dup),
                 new(OpCodes.Dup),
@@ -84,9 +83,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Ldloc_S, ev.LocalIndex),
                 new(OpCodes.Callvirt, PropertyGetter(typeof(DroppingAmmoEventArgs), nameof(DroppingAmmoEventArgs.Player))),
 
-                // ev.AmmoType
+                // ev.ItemType
                 new(OpCodes.Ldloc_S, ev.LocalIndex),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(DroppingAmmoEventArgs), nameof(DroppingAmmoEventArgs.AmmoType))),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(DroppingAmmoEventArgs), nameof(DroppingAmmoEventArgs.ItemType))),
 
                 // ev.Amount
                 new(OpCodes.Ldloc_S, ev.LocalIndex),
@@ -95,7 +94,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 // ammoPickups
                 new(OpCodes.Ldloc_S, ammoPickups.LocalIndex),
 
-                // Handlers::Player::OnDroppedAmmo(new DroppedAmmoEventArgs(ev.Player, ev.AmmoType, ev.Amount, ammoPickups))
+                // Handlers::Player::OnDroppedAmmo(new DroppedAmmoEventArgs(ev.Player, ev.ItemType, ev.Amount, ammoPickups))
                 new(OpCodes.Newobj, GetDeclaredConstructors(typeof(DroppedAmmoEventArgs))[0]),
                 new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnDroppedAmmo))),
             });

EXILED/Exiled.Events/Patches/Events/Player/InteractingDoor.cs

@@ -44,10 +44,11 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 0,
                 new CodeInstruction[]
                 {
-                    // InteractingDoorEventArgs ev = new(Player.Get(ply), __instance, false, true);
+                    // InteractingDoorEventArgs ev = new(Player.Get(ply), __instance, colliderId, false, true);
                     new(OpCodes.Ldarg_1),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
                     new(OpCodes.Ldarg_0),
+                    new(OpCodes.Ldarg_2),
                     new(OpCodes.Ldc_I4_0),
                     new(OpCodes.Ldc_I4_1),
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(InteractingDoorEventArgs))[0]),