diff --git a/EXILED/Exiled.CustomItems/API/Features/CustomKeycard.cs b/EXILED/Exiled.CustomItems/API/Features/CustomKeycard.cs
index d53846cbb0..c7a225a897 100644
--- a/EXILED/Exiled.CustomItems/API/Features/CustomKeycard.cs
+++ b/EXILED/Exiled.CustomItems/API/Features/CustomKeycard.cs
@@ -75,10 +75,9 @@ public override ItemType Type
///
public override void Give(Player player, Item item, bool displayMessage = true)
{
- base.Give(player, item, displayMessage);
-
if (item.Is(out Keycard card))
SetupKeycard(card);
+ base.Give(player, item, displayMessage);
}
///
diff --git a/EXILED/Exiled.Events/Patches/Events/Scp914/UpgradingPlayer.cs b/EXILED/Exiled.Events/Patches/Events/Scp914/UpgradingPlayer.cs
index 394fd8815b..cffd499ea9 100644
--- a/EXILED/Exiled.Events/Patches/Events/Scp914/UpgradingPlayer.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Scp914/UpgradingPlayer.cs
@@ -8,6 +8,7 @@
namespace Exiled.Events.Patches.Events.Scp914
{
using System.Collections.Generic;
+ using System.Reflection;
using System.Reflection.Emit;
using API.Features;
@@ -22,6 +23,7 @@ namespace Exiled.Events.Patches.Events.Scp914
using static HarmonyLib.AccessTools;
+ using OpCode = System.Reflection.Emit.OpCode;
using Scp914 = Handlers.Scp914;
///
@@ -112,8 +114,20 @@ private static IEnumerable Transpiler(IEnumerable x.opcode == OpCodes.Stloc_S && x.operand is LocalBuilder { LocalIndex: 10 }) + offset;
+ // index = newInstructions.FindIndex(x => x.opcode == OpCodes.Stloc_S && x.operand is LocalBuilder { LocalIndex: 10 }) + offset;
+ ConstructorInfo plugin_api_constructor = typeof(LabApi.Events.Arguments.Scp914Events.Scp914ProcessingInventoryItemEventArgs)
+ .GetConstructor(new[]
+ {
+ typeof(InventorySystem.Items.ItemBase),
+ typeof(Scp914KnobSetting),
+ typeof(ReferenceHub),
+ });
+ index = newInstructions.FindIndex(x => x.Is(OpCodes.Newobj, plugin_api_constructor)) + offset;
+
+ // ridtp lcz914
+ // noclip
+ // give tuxwonder7 47
newInstructions.InsertRange(
index,
new CodeInstruction[]
@@ -127,7 +141,7 @@ private static IEnumerable Transpiler(IEnumerable Transpiler(IEnumerable.Pool.Return(newInstructions);
}
}
-}
+}
\ No newline at end of file