Skip to content

KeycardPickup.Permissions now is not joke #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
louis1706 merged 1 commit into from
Aug 27, 2024
Merged

KeycardPickup.Permissions now is not joke #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions EXILED/Exiled.Events/EventArgs/Item/KeycardInteractingEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class KeycardInteractingEventArgs : IPlayerEvent, IDeniableEvent, IDoorEv
/// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
public KeycardInteractingEventArgs(BaseKeycardPickup pickup, Player player, DoorVariant door, bool isAllowed = true)
{
Pickup = Pickup.Get(pickup);
KeycardPickup = Pickup.Get<KeycardPickup>(pickup);
Player = player;
Door = Door.Get(door);
IsAllowed = isAllowed;
Expand All @@ -38,7 +38,10 @@ public KeycardInteractingEventArgs(BaseKeycardPickup pickup, Player player, Door
/// <summary>
/// Gets the item that's interacting with the door.
/// </summary>
public Pickup Pickup { get; }
public Pickup Pickup => KeycardPickup;

/// <inheritdoc cref="Pickup"/>
public KeycardPickup KeycardPickup { get; }

/// <summary>
/// Gets the player who's threw the keycard.
Expand Down
62 changes: 43 additions & 19 deletions EXILED/Exiled.Events/Patches/Events/Item/KeycardInteracting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ namespace Exiled.Events.Patches.Events.Item
using System.Reflection.Emit;

using API.Features;
using API.Features.Pickups;
using API.Features.Pools;

using Exiled.Events;
using Exiled.Events.Attributes;
using Exiled.Events.EventArgs.Item;

using Footprinting;
Expand All @@ -23,18 +23,19 @@ namespace Exiled.Events.Patches.Events.Item

using Interactables.Interobjects.DoorUtils;

using InventorySystem.Items.Keycards;
using InventorySystem.Items;

using UnityEngine;

using static HarmonyLib.AccessTools;

using BaseKeycardPickup = InventorySystem.Items.Keycards.KeycardPickup;

/// <summary>
/// Patches <see cref="KeycardPickup.ProcessCollision(Collision)"/>.
/// 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(KeycardPickup), nameof(KeycardPickup.ProcessCollision))]
[HarmonyPatch(typeof(BaseKeycardPickup), nameof(BaseKeycardPickup.ProcessCollision))]
internal static class KeycardInteracting
{
private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
Expand All @@ -46,7 +47,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
LocalBuilder havePermissions = generator.DeclareLocal(typeof(bool));

Label skip = generator.DefineLabel();
Label skip2 = generator.DefineLabel();
Label ret = generator.DefineLabel();

int offset = 1;
Expand All @@ -58,6 +58,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
index,
new[]
{
// check and write door lock state (isUnlocked)
new(OpCodes.Ldc_I4_0),
new(OpCodes.Ceq),
new CodeInstruction(OpCodes.Stloc_S, isUnlocked.LocalIndex),
Expand All @@ -81,23 +82,28 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
new CodeInstruction(OpCodes.Nop).WithLabels(skip),
});

newInstructions.RemoveRange(index + 6, 2);
// 6 new instructions
offset = 6;
index += offset;

index = newInstructions.FindIndex(i => i.Calls(Method(typeof(DoorPermissions), nameof(DoorPermissions.CheckPermissions)))) + offset;
newInstructions.RemoveRange(index, 14);

newInstructions.InsertRange(
index,
new[]
{
new(OpCodes.Stloc_S, havePermissions.LocalIndex),
new(OpCodes.Br_S, skip2),

// save original return
new CodeInstruction(OpCodes.Ret).MoveLabelsFrom(newInstructions[index + 1]),
new CodeInstruction(OpCodes.Nop).WithLabels(skip2),
// override permissions check, to implement KeycardPickup::Permissions
new(OpCodes.Ldarg_0),
new(OpCodes.Ldloc_1),
new CodeInstruction(OpCodes.Call, Method(typeof(KeycardInteracting), nameof(KeycardInteracting.CheckPermissions))),
new CodeInstruction(OpCodes.Stloc_S, havePermissions.LocalIndex),
});

newInstructions.RemoveRange(index + 4, 2);
// 4 new instructions
offset = 4;
index += offset;

newInstructions.RemoveRange(index, 2);

offset = -5;
index = newInstructions.FindIndex(i => i.Calls(PropertySetter(typeof(DoorVariant), nameof(DoorVariant.NetworkTargetState)))) + offset;
Expand All @@ -111,7 +117,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi

// PreviousOwner.Hub
new CodeInstruction(OpCodes.Ldarg_0),
new(OpCodes.Ldflda, Field(typeof(KeycardPickup), nameof(KeycardPickup.PreviousOwner))),
new(OpCodes.Ldflda, Field(typeof(BaseKeycardPickup), nameof(BaseKeycardPickup.PreviousOwner))),
new(OpCodes.Ldfld, Field(typeof(Footprint), nameof(Footprint.Hub))),
new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),

Expand Down Expand Up @@ -145,10 +151,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
new(OpCodes.Brfalse_S, ret),
});

index = newInstructions.Count - 1;

newInstructions.InsertRange(
index,
newInstructions.Count - 1,
new[]
{
// call animation sets(we don't want to call the event more than once)
Expand All @@ -163,5 +167,25 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi

ListPool<CodeInstruction>.Pool.Return(newInstructions);
}

private static bool CheckPermissions(BaseKeycardPickup keycard, DoorPermissions permissions)
{
if (permissions.RequiredPermissions == KeycardPermissions.None)
{
return true;
}

if (Pickup.Get(keycard) is KeycardPickup keycardPickup)
{
if (!permissions.RequireAll)
{
return ((KeycardPermissions)keycardPickup.Permissions & permissions.RequiredPermissions) != 0;
}

return ((KeycardPermissions)keycardPickup.Permissions & permissions.RequiredPermissions) == permissions.RequiredPermissions;
}

return InventorySystem.InventoryItemLoader.AvailableItems.TryGetValue(keycard.Info.ItemId, out ItemBase itemBase) && permissions.CheckPermissions(itemBase, null);
}
}
}