fix

Author: Someone-193

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

@@ -10,12 +10,14 @@ namespace Exiled.Events.Patches.Events.Player
     using System.Collections.Generic;
     using System.Reflection.Emit;
 
+    using CustomPlayerEffects;
     using Exiled.API.Features;
     using Exiled.API.Features.Pools;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Player;
     using HarmonyLib;
     using InventorySystem.Items.Usables;
+    using UnityEngine;
 
     using static HarmonyLib.AccessTools;
 
@@ -27,13 +29,56 @@ namespace Exiled.Events.Patches.Events.Player
     [HarmonyPatch(typeof(Consumable), nameof(Consumable.OnHolstered))]
     public class UsedItemByHolstering
     {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            // after ServerRemoveSelf, which lines up with before the ret
-            newInstructions.InsertRange(newInstructions.Count - 1, new CodeInstruction[]
+            LocalBuilder handler = generator.DeclareLocal(typeof(PlayerHandler));
+            LocalBuilder curr = generator.DeclareLocal(typeof(CurrentlyUsedItem));
+
+            Label retLabel = generator.DefineLabel();
+
+            // add retLabel to return
+            newInstructions[newInstructions.Count - 1].WithLabels(retLabel);
+
+            // before ServerRemoveSelf, 2 instructions behind the return instruction
+            newInstructions.InsertRange(newInstructions.Count - 1 - 2, new CodeInstruction[]
             {
+                // if (!UsableItemsController.Handlers.TryGetValue(Owner, out PlayerHandler handler) return;
+                new(OpCodes.Ldsfld, Field(typeof(UsableItemsController), nameof(UsableItemsController.Handlers))),
+                new(OpCodes.Ldarg_0),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(Consumable), nameof(Consumable.Owner))),
+                new(OpCodes.Ldloca_S, handler),
+                new(OpCodes.Callvirt, Method(typeof(Dictionary<ReferenceHub, PlayerHandler>), nameof(Dictionary<ReferenceHub, PlayerHandler>.TryGetValue))),
+                new(OpCodes.Brfalse_S, retLabel),
+
+                // CurrentlyUsedItem curr = handler.CurrentUsable;
+                new(OpCodes.Ldloc_S, handler),
+                new(OpCodes.Ldfld, Field(typeof(PlayerHandler), nameof(PlayerHandler.CurrentUsable))),
+                new(OpCodes.Stloc_S, curr),
+
+                // if (curr.ItemSerial == 0) return;
+                new(OpCodes.Ldloc_S, curr),
+                new(OpCodes.Ldfld, Field(typeof(CurrentlyUsedItem), nameof(CurrentlyUsedItem.ItemSerial))),
+                new(OpCodes.Brfalse_S, retLabel),
+
+                // this check is to not call the event if the trigger was from UsableItemsController (the standard trigger for this event), contact @Someone on discord for more details
+                // if (Time.timeSinceLevelLoad >= currentUsable.StartTime + (currentUsable.Item.UseTime / cons.ItemTypeId.GetSpeedMultiplier(hub))) return;
+                new(OpCodes.Call, PropertyGetter(typeof(Time), nameof(Time.timeSinceLevelLoad))),
+                new(OpCodes.Ldloc_S, curr),
+                new(OpCodes.Ldfld, Field(typeof(CurrentlyUsedItem), nameof(CurrentlyUsedItem.StartTime))),
+                new(OpCodes.Ldloc_S, curr),
+                new(OpCodes.Ldfld, Field(typeof(CurrentlyUsedItem), nameof(CurrentlyUsedItem.Item))),
+                new(OpCodes.Ldfld, Field(typeof(UsableItem), nameof(UsableItem.UseTime))),
+                new(OpCodes.Ldarg_0),
+                new(OpCodes.Ldfld, Field(typeof(Consumable), nameof(Consumable.ItemTypeId))),
+                new(OpCodes.Ldarg_0),
+                new(OpCodes.Callvirt, PropertyGetter(typeof(Consumable), nameof(Consumable.Owner))),
+                new(OpCodes.Call, Method(typeof(UsableItemModifierEffectExtensions), nameof(UsableItemModifierEffectExtensions.GetSpeedMultiplier))),
+                new(OpCodes.Div),
+                new(OpCodes.Add),
+                new(OpCodes.Bgt_Un_S, retLabel),
+
                 // this.Owner
                 new(OpCodes.Ldarg_0),
                 new(OpCodes.Callvirt, PropertyGetter(typeof(Consumable), nameof(Consumable.Owner))),