fix: few fixes (ExMod-Team#514)

* fix: keycard interacting

* fix: EscapingEvent IsAllowed

Author: BoltonDev

EXILED/Exiled.Events/Config.cs

@@ -77,6 +77,7 @@ public sealed class Config : IConfig
         /// <summary>
         /// Gets or sets a value indicating whether keycard throw can affect basic doors.
         /// </summary>
+        /// TODO: Make a poll about removing this config. (unimplemented since 9.6.0-beta7)
         [Description("Indicates whether thrown keycards can affect doors that don't require any permissions")]
         public bool CanKeycardThrowAffectDoors { get; set; } = false;
 

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

@@ -39,7 +39,7 @@ public EscapingEventArgs(ReferenceHub referenceHub, RoleTypeId newRole, EscapeSc
             Player = Player.Get(referenceHub);
             NewRole = newRole;
             EscapeScenario = escapeScenario;
-            IsAllowed = escapeScenario is not EscapeScenario.CustomEscape;
+            IsAllowed = escapeScenario is not EscapeScenario.None and not EscapeScenario.CustomEscape;
         }
 
         /// <summary>

EXILED/Exiled.Events/Patches/Events/Item/KeycardInteracting.cs

@@ -14,17 +14,13 @@ namespace Exiled.Events.Patches.Events.Item
     using API.Features.Pickups;
     using API.Features.Pools;
     using Attributes;
-    using Exiled.Events;
     using Exiled.Events.EventArgs.Item;
 
     using Footprinting;
 
     using HarmonyLib;
 
     using Interactables.Interobjects.DoorUtils;
-
-    using InventorySystem.Items;
-
     using UnityEngine;
 
     using static HarmonyLib.AccessTools;
@@ -35,6 +31,7 @@ namespace Exiled.Events.Patches.Events.Item
     /// Patches <see cref="BaseKeycardPickup.ProcessCollision(Collision)"/> and adds <see cref="KeycardPickup.Permissions"/> implementation.
     /// Adds the <see cref="Handlers.Player.InteractingDoor"/> event.
     /// </summary>
+    [EventPatch(typeof(Handlers.Item), nameof(Handlers.Item.KeycardInteracting))]
     [HarmonyPatch(typeof(BaseKeycardPickup), nameof(BaseKeycardPickup.ProcessCollision))]
     internal static class KeycardInteracting
     {
@@ -90,14 +87,10 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 // door
                 new(OpCodes.Ldloc_1),
 
-                // isAllowed = isUnlocked && hasPermission && Events.Instance.Config.CanKeycardThrowAffectDoors
+                // isAllowed = isUnlocked && hasPermission
                 new(OpCodes.Ldloc_S, isUnlocked.LocalIndex),
                 new(OpCodes.Ldloc_S, hasPermission.LocalIndex),
                 new(OpCodes.And),
-                new(OpCodes.Call, PropertyGetter(typeof(Events), nameof(Events.Instance))),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(Events), nameof(Events.Config))),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(Config), nameof(Config.CanKeycardThrowAffectDoors))),
-                new(OpCodes.And),
 
                 // ev = new KeycardInteractingEventArgs(pickup, player, door, isAllowed)
                 new(OpCodes.Newobj, GetDeclaredConstructors(typeof(KeycardInteractingEventArgs))[0]),