[Feature] Interacting door event

Exiled.Events/EventArgs/Player/InteractingDoorEventArgs.cs

@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.EventArgs.Player
 {
+    using API.Enums;
     using API.Features;
 
     using Interactables.Interobjects.DoorUtils;
@@ -30,11 +31,15 @@ public class InteractingDoorEventArgs : IPlayerEvent, IDoorEvent, IDeniableEvent
         /// <param name="isAllowed">
         ///     <inheritdoc cref="IsAllowed" />
         /// </param>
-        public InteractingDoorEventArgs(Player player, DoorVariant door, bool isAllowed = true)
+        /// <param name="interactionResult">
+        ///     <inheritdoc cref="InteractionResult" />
+        /// </param>
+        public InteractingDoorEventArgs(Player player, DoorVariant door, bool isAllowed = true, DoorBeepType interactionResult = DoorBeepType.InteractionAllowed)
         {
             Player = player;
             Door = Door.Get(door);
             IsAllowed = isAllowed;
+            InteractionResult = interactionResult;
         }
 
         /// <summary>
@@ -51,5 +56,10 @@ public InteractingDoorEventArgs(Player player, DoorVariant door, bool isAllowed
         ///     Gets the player who's interacting with the door.
         /// </summary>
         public Player Player { get; }
+
+        /// <summary>
+        ///     Gets or sets a value indicating the result of the interaction.
+        /// </summary>
+        public DoorBeepType InteractionResult { get; set; }
     }
-}
+}

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

@@ -14,6 +14,7 @@ namespace Exiled.Events.Patches.Events.Player
 #pragma warning disable SA1512
     using System;
 
+    using API.Enums;
     using API.Features;
     using Exiled.Events.EventArgs.Player;
 
@@ -36,57 +37,47 @@ private static bool Prefix(DoorVariant __instance, ReferenceHub ply, byte collid
         {
             try
             {
-                InteractingDoorEventArgs ev = new(Player.Get(ply), __instance, false);
-
-                bool bypassDenied = false;
-                bool allowInteracting = false;
+                InteractingDoorEventArgs ev = new(Player.Get(ply), __instance, true, DoorBeepType.InteractionAllowed);
 
                 if (__instance.ActiveLocks > 0 && !ply.serverRoles.BypassMode)
                 {
                     DoorLockMode mode = DoorLockUtils.GetMode((DoorLockReason)__instance.ActiveLocks);
-                    if ((!mode.HasFlagFast(DoorLockMode.CanClose) || !mode.HasFlagFast(DoorLockMode.CanOpen)) &&
-                        (!mode.HasFlagFast(DoorLockMode.ScpOverride) || !ply.IsSCP(true)) &&
-                        (mode == DoorLockMode.FullLock || (__instance.TargetState && !mode.HasFlagFast(DoorLockMode.CanClose)) ||
-                        (!__instance.TargetState && !mode.HasFlagFast(DoorLockMode.CanOpen))))
+                    if ((!mode.HasFlagFast(DoorLockMode.CanClose) || !mode.HasFlagFast(DoorLockMode.CanOpen)) && (!mode.HasFlagFast(DoorLockMode.ScpOverride) || !ply.IsSCP(true)) && (mode == DoorLockMode.FullLock || (__instance.TargetState && !mode.HasFlagFast(DoorLockMode.CanClose)) || (!__instance.TargetState && !mode.HasFlagFast(DoorLockMode.CanOpen))))
                     {
-                        ev.IsAllowed = false;
-                        bypassDenied = true;
+                        if (!EventManager.ExecuteEvent(PluginAPI.Enums.ServerEventType.PlayerInteractDoor, new object[]
+                        {
+                            ply,
+                            __instance,
+                            false,
+                        }))
+                        {
+                            return false;
+                        }
+                        ev.InteractionResult = DoorBeepType.LockBypassDenied;
+                        Process(__instance, ply, colliderId, ev);
+                        return false;
                     }
                 }
-
-                if (!bypassDenied && (allowInteracting = __instance.AllowInteracting(ply, colliderId)))
+                if (!__instance.AllowInteracting(ply, colliderId))
                 {
-                    if (ply.GetRoleId() == RoleTypeId.Scp079 || __instance.RequiredPermissions.CheckPermissions(ply.inventory.CurInstance, ply))
-                    {
-                        ev.IsAllowed = true;
-                    }
-                    else
-                    {
-                        ev.IsAllowed = false;
-                    }
+                    ev.IsAllowed = false;
+                    ev.InteractionResult = DoorBeepType.InteractionDenied;
+                    Process(__instance, ply, colliderId, ev);
+                    return false;
                 }
-
-                Handlers.Player.OnInteractingDoor(ev);
-
-                if (EventManager.ExecuteEvent(PluginAPI.Enums.ServerEventType.PlayerInteractDoor, new object[] { ply, __instance, ev.IsAllowed }))
+                bool flag = ply.GetRoleId() == RoleTypeId.Scp079 || __instance.RequiredPermissions.CheckPermissions(ply.inventory.CurInstance, ply);
+                if (!EventManager.ExecuteEvent(PluginAPI.Enums.ServerEventType.PlayerInteractDoor, new object[]
                 {
-                    if (ev.IsAllowed && allowInteracting)
-                    {
-                        __instance.NetworkTargetState = !__instance.TargetState;
-                        __instance._triggerPlayer = ply;
-                    }
-                    else if (bypassDenied)
-                    {
-                        __instance.LockBypassDenied(ply, colliderId);
-                    }
-                    // Don't call the RPC if the door is still moving
-                    else if (allowInteracting)
-                    {
-                        // To avoid breaking their API, call the access denied event
-                        // when our event prevents the door from opening
-                        __instance.PermissionsDenied(ply, colliderId);
-                        DoorEvents.TriggerAction(__instance, DoorAction.AccessDenied, ply);
-                    }
+                    ply,
+                    __instance,
+                    flag,
+                }))
+                {
+                    return false;
+                }
+                if (flag)
+                {
+                    Process(__instance, ply, colliderId, ev);
                 }
                 return false;
             }
@@ -96,5 +87,27 @@ private static bool Prefix(DoorVariant __instance, ReferenceHub ply, byte collid
                 return true;
             }
         }
+
+        private static void Process(DoorVariant __instance, ReferenceHub ply, byte colliderId, InteractingDoorEventArgs ev)
+        {
+            Handlers.Player.OnInteractingDoor(ev);
+            if (ev.IsAllowed)
+            {
+                switch (ev.InteractionResult)
+                {
+                    case DoorBeepType.PermissionDenied:
+                        __instance.PermissionsDenied(ply, colliderId);
+                        DoorEvents.TriggerAction(__instance, DoorAction.AccessDenied, ply);
+                        break;
+                    case DoorBeepType.LockBypassDenied:
+                        __instance.LockBypassDenied(ply, colliderId);
+                        break;
+                    default:
+                        __instance.NetworkTargetState = !__instance.TargetState;
+                        __instance._triggerPlayer = ply;
+                        break;
+                }
+            }
+        }
     }
 }