Fix & Small change on UsingAndCancellingItemUse

Author: louis1706

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

@@ -10,6 +10,7 @@ namespace Exiled.Events.EventArgs.Player
     using API.Features;
     using Exiled.API.Features.Items;
     using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items.Usables;
 
     /// <summary>
     /// Contains all information before a player cancels usage of an item.
@@ -19,14 +20,16 @@ public class CancelledItemUseEventArgs : IPlayerEvent, IUsableEvent
         /// <summary>
         /// Initializes a new instance of the <see cref="CancelledItemUseEventArgs" /> class.
         /// </summary>
-        /// <param name="player">The player who's stopping the use of an item.</param>
-        /// <param name="item">
+        /// <param name="hub">
+        /// <inheritdoc cref="Player" />
+        /// </param>
+        /// <param name="usableItem">
         /// <inheritdoc cref="Usable" />
         /// </param>
-        public CancelledItemUseEventArgs(Player player, Item item)
+        public CancelledItemUseEventArgs(ReferenceHub hub, UsableItem usableItem)
         {
-            Player = player;
-            Usable = item is Usable usable ? usable : null;
+            Player = Player.Get(hub);
+            Usable = Item.Get<Usable>(usableItem);
         }
 
         /// <summary>

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

@@ -20,13 +20,15 @@ public class CancellingItemUseEventArgs : IPlayerEvent, IDeniableEvent, IUsableE
         /// <summary>
         /// Initializes a new instance of the <see cref="CancellingItemUseEventArgs" /> class.
         /// </summary>
-        /// <param name="player">The player who's stopping the use of an item.</param>
+        /// <param name="hub">
+        /// <inheritdoc cref="Player" />
+        /// </param>
         /// <param name="item">
         /// <inheritdoc cref="UsedItemEventArgs.Item" />
         /// </param>
-        public CancellingItemUseEventArgs(Player player, UsableItem item)
+        public CancellingItemUseEventArgs(ReferenceHub hub, UsableItem item)
         {
-            Player = player;
+            Player = Player.Get(hub);
             Usable = Item.Get<Usable>(item);
         }
 

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

@@ -21,16 +21,18 @@ public class UsingItemEventArgs : IPlayerEvent, IDeniableEvent, IUsableEvent
         /// <summary>
         /// Initializes a new instance of the <see cref="UsingItemEventArgs" /> class.
         /// </summary>
-        /// <param name="player">The player who's going to use the item.</param>
+        /// <param name="hub">
+        /// <inheritdoc cref="Player" />
+        /// </param>
         /// <param name="cooldown">
         /// <inheritdoc cref="Cooldown" />
         /// </param>
         /// <param name="item">
         /// <inheritdoc cref="UsedItemEventArgs.Item" />
         /// </param>
-        public UsingItemEventArgs(Player player, UsableItem item, float cooldown)
+        public UsingItemEventArgs(ReferenceHub hub, UsableItem item, float cooldown)
         {
-            Player = player;
+            Player = Player.Get(hub);
             Usable = Item.Get(item) is Usable usable ? usable : null;
             Cooldown = cooldown;
         }

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

@@ -20,6 +20,7 @@ namespace Exiled.Events.Patches.Events.Player
     using HarmonyLib;
 
     using InventorySystem.Items.Usables;
+    using LabApi.Events.Arguments.PlayerEvents;
     using Utils.Networking;
 
     using static HarmonyLib.AccessTools;
@@ -53,9 +54,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 index,
                 new CodeInstruction[]
                 {
-                    // Player.Get(referenceHub)
+                    // referenceHub
                     new CodeInstruction(OpCodes.Ldloc_0).MoveLabelsFrom(newInstructions[index]),
-                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
                     // usableItem
                     new(OpCodes.Ldloc_1),
@@ -90,14 +90,11 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 index,
                 new[]
                 {
-                    // Player.Get(referenceHub)
+                    // referenceHub
                     new CodeInstruction(OpCodes.Ldloc_0),
-                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
-                    // handler.CurrentUsable.Item
-                    new(OpCodes.Ldloc_2),
-                    new(OpCodes.Ldflda, Field(typeof(PlayerHandler), nameof(PlayerHandler.CurrentUsable))),
-                    new(OpCodes.Ldfld, Field(typeof(CurrentlyUsedItem), nameof(CurrentlyUsedItem.Item))),
+                    // usableItem
+                    new(OpCodes.Ldloc_1),
 
                     // CancellingItemUseEventArgs ev = new(Player, UsableItem)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(CancellingItemUseEventArgs))[0]),
@@ -114,28 +111,27 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Brfalse_S, returnLabel),
                 });
 
-            offset = 3;
+            // right before the LabAPI event "new PlayerCancelledUsingItemEventArgs(...)"
+            offset = -2;
             index = newInstructions.FindLastIndex(
-                instruction => instruction.Calls(Method(typeof(NetworkUtils), nameof(NetworkUtils.SendToAuthenticated)))) + offset;
-            /* // TODO: FIX THE CRASH ISSUE
+                instruction => instruction.opcode == OpCodes.Newobj) + offset;
+
             newInstructions.InsertRange(
                 index,
                 new[]
                 {
-                    // Player.Get(referenceHub)
+                    // referenceHub
                     new CodeInstruction(OpCodes.Ldloc_0),
-                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
-                    // evCancellingItemUseEventArgs.Item
-                    new(OpCodes.Ldloc_S, evCancellingItemUseEventArgs.LocalIndex),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(CancellingItemUseEventArgs), nameof(CancellingItemUseEventArgs.Item))),
+                    // usableItem
+                    new(OpCodes.Ldloc_1),
 
-                    // CancellingItemUseEventArgs ev = new(Player, UsableItem)
+                    // CancelledItemUseEventArgs ev = new(ReferenceHub, UsableItem)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(CancelledItemUseEventArgs))[0]),
 
-                    // Handlers.Player.OnCancellingItemUse(ev)
+                    // Handlers.Player.OnCancelledItemUse(ev)
                     new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnCancelledItemUse))),
-                });*/
+                });
 
             newInstructions[newInstructions.Count - 1].WithLabels(returnLabel);