From d03181fc4d4b32b200b9ef92135e10ff32759554 Mon Sep 17 00:00:00 2001
From: Misaka-ZeroTwo <45165615+Misaka-ZeroTwo@users.noreply.github.com>
Date: Fri, 26 Jul 2024 17:36:42 +0800
Subject: [PATCH 1/5] Update labeler.yml

---
 .github/labeler.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 34ff31f3fa..6e4b185880 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -13,27 +13,27 @@ Scripts: # Add the 'Scripts' label
 
 regarding-events: # Add the 'Events' label
 - changed-files:
-  - any-glob-to-any-file: Exiled.Events/** # Any Modifications to events
+  - any-glob-to-any-file: EXILED/Exiled.Events/** # Any Modifications to events
 
 regarding-api: # Add the 'API' label
 - changed-files:
-  - any-glob-to-any-file: Exiled.API/** # Any modifications to the API
+  - any-glob-to-any-file: EXILED/Exiled.API/** # Any modifications to the API
 
 regarding-transpiler: # Add the 'transpiler' label
 - changed-files:
-  - any-glob-to-any-file: Exiled.Events/Patches/**/* # Any modifications to transpiler files
+  - any-glob-to-any-file: EXILED/Exiled.Events/Patches/**/* # Any modifications to transpiler files
 
 CustomModules: # Add the 'CustomModules' label
 - changed-files:
-  - any-glob-to-any-file: Exiled.CustomModules/** # Any modifications to CustomModules
+  - any-glob-to-any-file: EXILED/Exiled.CustomModules/** # Any modifications to CustomModules
 
 Installer: # Add the 'Installer' label
 - changed-files:
-  - any-glob-to-any-file: Exiled.Installer/** # Any modifications to the Installer
+  - any-glob-to-any-file: EXILED/Exiled.Installer/** # Any modifications to the Installer
 
 Localization: # Add the 'Localization' label
 - changed-files:
-  - any-glob-to-any-file: Localization/** # Any modifications to Localization
+  - any-glob-to-any-file: EXILED/Localization/** # Any modifications to Localization
 
 GitHub_Actions: # Add the 'GitHub' label
 - changed-files:

From 5b21478494fe37ba567138fc271ad4de88a33bbe Mon Sep 17 00:00:00 2001
From: Misaka_ZeroTwo <45165615+Misaka-ZeroTwo@users.noreply.github.com>
Date: Sun, 28 Jul 2024 02:00:49 +0800
Subject: [PATCH 2/5] RemovingHandcuffs event

---
 EXILED/Exiled.API/Enums/UncuffReason.cs       |  35 +++++
 .../Player/RemovingHandcuffsEventArgs.cs      |  10 +-
 .../Events/Player/ProcessDisarmMessage.cs     | 133 +++++++++++++++++-
 3 files changed, 176 insertions(+), 2 deletions(-)
 create mode 100644 EXILED/Exiled.API/Enums/UncuffReason.cs

diff --git a/EXILED/Exiled.API/Enums/UncuffReason.cs b/EXILED/Exiled.API/Enums/UncuffReason.cs
new file mode 100644
index 0000000000..2e62067f56
--- /dev/null
+++ b/EXILED/Exiled.API/Enums/UncuffReason.cs
@@ -0,0 +1,35 @@
+// -----------------------------------------------------------------------
+// <copyright file="UncuffReason.cs" company="Exiled Team">
+// Copyright (c) Exiled Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.API.Enums
+{
+    /// <summary>
+    /// Reasons that player gets uncuffed.
+    /// </summary>
+    public enum UncuffReason
+    {
+        /// <summary>
+        /// Uncuffed by a player.
+        /// </summary>
+        Player,
+
+        /// <summary>
+        /// Uncuffed due to the distance between cuffer and target.
+        /// </summary>
+        OutOfRange,
+
+        /// <summary>
+        /// Uncuffed due to the cuffer no longer alive.
+        /// </summary>
+        CufferDied,
+
+        /// <summary>
+        /// Uncuffed by admin or plugin.
+        /// </summary>
+        CustomUncuff,
+    }
+}
diff --git a/EXILED/Exiled.Events/EventArgs/Player/RemovingHandcuffsEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/RemovingHandcuffsEventArgs.cs
index c6a90a8355..1d3a663e1e 100644
--- a/EXILED/Exiled.Events/EventArgs/Player/RemovingHandcuffsEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Player/RemovingHandcuffsEventArgs.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.EventArgs.Player
 {
+    using API.Enums;
     using API.Features;
     using Exiled.Events.EventArgs.Interfaces;
 
@@ -20,11 +21,13 @@ public class RemovingHandcuffsEventArgs : IPlayerEvent, IDeniableEvent
         /// </summary>
         /// <param name="cuffer">The cuffer player.</param>
         /// <param name="target">The target player to be uncuffed.</param>
+        /// <param name="uncuffReason">The reason of removing handcuffs.</param>
         /// <param name="isAllowed">Indicates whether the event can be executed or not.</param>
-        public RemovingHandcuffsEventArgs(Player cuffer, Player target, bool isAllowed = true)
+        public RemovingHandcuffsEventArgs(Player cuffer, Player target, UncuffReason uncuffReason, bool isAllowed = true)
         {
             Player = cuffer;
             Target = target;
+            UncuffReason = uncuffReason;
             IsAllowed = isAllowed;
         }
 
@@ -42,5 +45,10 @@ public RemovingHandcuffsEventArgs(Player cuffer, Player target, bool isAllowed =
         /// Gets the cuffer player.
         /// </summary>
         public Player Player { get; }
+
+        /// <summary>
+        /// Gets the reason of removing handcuffs.
+        /// </summary>
+        public UncuffReason UncuffReason { get; }
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/ProcessDisarmMessage.cs b/EXILED/Exiled.Events/Patches/Events/Player/ProcessDisarmMessage.cs
index bd83c19e9e..0ce5d9e284 100644
--- a/EXILED/Exiled.Events/Patches/Events/Player/ProcessDisarmMessage.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Player/ProcessDisarmMessage.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.Patches.Events.Player
 {
+    #pragma warning disable SA1402 // File may only contain a single type
     using System.Collections.Generic;
     using System.Reflection;
     using System.Reflection.Emit;
@@ -55,10 +56,13 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldfld, Field(typeof(DisarmMessage), nameof(DisarmMessage.PlayerToDisarm))),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
+                    // UncuffReason.Player
+                    new(OpCodes.Ldc_I4_0),
+
                     // true
                     new(OpCodes.Ldc_I4_1),
 
-                    // RemovingHandcuffsEventArgs ev = new(Player, Player, true)
+                    // RemovingHandcuffsEventArgs ev = new(Player, Player, UncuffReason.Player, true)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RemovingHandcuffsEventArgs))[0]),
                     new(OpCodes.Dup),
 
@@ -112,4 +116,131 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             ListPool<CodeInstruction>.Pool.Return(newInstructions);
         }
     }
+
+    /// <summary>
+    /// Patches <see cref="DisarmedPlayers.ValidateEntry(DisarmedPlayers.DisarmedEntry)" />.
+    /// Invokes <see cref="Handlers.Player.RemovingHandcuffs" /> event.
+    /// </summary>
+    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.RemovingHandcuffs))]
+    [HarmonyPatch(typeof(DisarmedPlayers), nameof(DisarmedPlayers.ValidateEntry))]
+    internal static class Uncuff
+    {
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
+            Label returnLabel = generator.DefineLabel();
+
+            int offset = 2;
+            int index = newInstructions.FindLastIndex(
+                instruction => instruction.Calls(Method(typeof(ReferenceHub), nameof(ReferenceHub.TryGetHubNetID)))) + offset;
+
+            newInstructions.InsertRange(
+                index,
+                new[]
+                {
+                    // Player.Get(Cuffer)
+                    new CodeInstruction(OpCodes.Ldloc_1),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // Player.Get(Target)
+                    new(OpCodes.Ldloc_0),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // UncuffReason.CufferDied
+                    new(OpCodes.Ldc_I4_2),
+
+                    // true
+                    new(OpCodes.Ldc_I4_1),
+
+                    // RemovingHandcuffsEventArgs ev = new(Cuffer, Target, UncuffReason.CufferDied, true)
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RemovingHandcuffsEventArgs))[0]),
+                    new(OpCodes.Dup),
+
+                    // Handlers.Player.OnRemovingHandcuffs(ev)
+                    new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnRemovingHandcuffs))),
+
+                    // if (!ev.IsAllowed)
+                    //    return true;
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(RemovingHandcuffsEventArgs), nameof(RemovingHandcuffsEventArgs.IsAllowed))),
+                    new(OpCodes.Brfalse_S, returnLabel),
+                });
+
+            offset = 5;
+            index = newInstructions.FindLastIndex(
+                instruction => instruction.Calls(PropertyGetter(typeof(PlayerRoles.PlayerRoleManager), nameof(PlayerRoles.PlayerRoleManager.CurrentRole)))) + offset;
+
+            newInstructions.InsertRange(
+                index,
+                new[]
+                {
+                    // Player.Get(Cuffer)
+                    new CodeInstruction(OpCodes.Ldloc_1),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // Player.Get(Target)
+                    new(OpCodes.Ldloc_0),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // UncuffReason.CufferDied
+                    new(OpCodes.Ldc_I4_2),
+
+                    // true
+                    new(OpCodes.Ldc_I4_1),
+
+                    // RemovingHandcuffsEventArgs ev = new(Cuffer, Target, UncuffReason.CufferDied, true)
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RemovingHandcuffsEventArgs))[0]),
+                    new(OpCodes.Dup),
+
+                    // Handlers.Player.OnRemovingHandcuffs(ev)
+                    new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnRemovingHandcuffs))),
+
+                    // if (!ev.IsAllowed)
+                    //    return true;
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(RemovingHandcuffsEventArgs), nameof(RemovingHandcuffsEventArgs.IsAllowed))),
+                    new(OpCodes.Brfalse_S, returnLabel),
+                });
+
+            offset = 3;
+            index = newInstructions.FindLastIndex(
+                instruction => instruction.Calls(PropertyGetter(typeof(UnityEngine.Vector3), nameof(UnityEngine.Vector3.sqrMagnitude)))) + offset;
+
+            newInstructions.InsertRange(
+                index,
+                new[]
+                {
+                    // Player.Get(Cuffer)
+                    new CodeInstruction(OpCodes.Ldloc_1),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // Player.Get(Target)
+                    new(OpCodes.Ldloc_0),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // UncuffReason.OutOfRange
+                    new(OpCodes.Ldc_I4_1),
+
+                    // true
+                    new(OpCodes.Ldc_I4_1),
+
+                    // RemovingHandcuffsEventArgs ev = new(Cuffer, Target, UncuffReason.OutOfRange, true)
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RemovingHandcuffsEventArgs))[0]),
+                    new(OpCodes.Dup),
+
+                    // Handlers.Player.OnRemovingHandcuffs(ev)
+                    new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnRemovingHandcuffs))),
+
+                    // if (!ev.IsAllowed)
+                    //    return true;
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(RemovingHandcuffsEventArgs), nameof(RemovingHandcuffsEventArgs.IsAllowed))),
+                    new(OpCodes.Brfalse_S, returnLabel),
+                });
+
+            newInstructions[newInstructions.Count - 2].labels.Add(returnLabel);
+
+            for (int z = 0; z < newInstructions.Count; z++)
+                yield return newInstructions[z];
+
+            ListPool<CodeInstruction>.Pool.Return(newInstructions);
+        }
+    }
 }
\ No newline at end of file

From 967d20a5364192b33a47c042d5f29d8fc2285ae3 Mon Sep 17 00:00:00 2001
From: Misaka_ZeroTwo <45165615+Misaka-ZeroTwo@users.noreply.github.com>
Date: Sun, 28 Jul 2024 02:06:13 +0800
Subject: [PATCH 3/5] Update UncuffReason.cs

---
 EXILED/Exiled.API/Enums/UncuffReason.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/EXILED/Exiled.API/Enums/UncuffReason.cs b/EXILED/Exiled.API/Enums/UncuffReason.cs
index 2e62067f56..6b3018fdac 100644
--- a/EXILED/Exiled.API/Enums/UncuffReason.cs
+++ b/EXILED/Exiled.API/Enums/UncuffReason.cs
@@ -26,10 +26,5 @@ public enum UncuffReason
         /// Uncuffed due to the cuffer no longer alive.
         /// </summary>
         CufferDied,
-
-        /// <summary>
-        /// Uncuffed by admin or plugin.
-        /// </summary>
-        CustomUncuff,
     }
 }

From ea9930978a3f2d0565f132abffa096d8e627f10d Mon Sep 17 00:00:00 2001
From: Misaka_ZeroTwo <45165615+Misaka-ZeroTwo@users.noreply.github.com>
Date: Tue, 6 Aug 2024 19:03:41 +0800
Subject: [PATCH 4/5] New event

---
 .../Player/RemovedHandcuffsEventArgs.cs       |  47 ++++++++
 .../Player/RemovingHandcuffsEventArgs.cs      |   3 +-
 EXILED/Exiled.Events/Handlers/Player.cs       |  11 ++
 .../Events/Player/ProcessDisarmMessage.cs     | 111 ++++++++++++++++--
 4 files changed, 160 insertions(+), 12 deletions(-)
 create mode 100644 EXILED/Exiled.Events/EventArgs/Player/RemovedHandcuffsEventArgs.cs

diff --git a/EXILED/Exiled.Events/EventArgs/Player/RemovedHandcuffsEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/RemovedHandcuffsEventArgs.cs
new file mode 100644
index 0000000000..06468b5d1c
--- /dev/null
+++ b/EXILED/Exiled.Events/EventArgs/Player/RemovedHandcuffsEventArgs.cs
@@ -0,0 +1,47 @@
+// -----------------------------------------------------------------------
+// <copyright file="RemovedHandcuffsEventArgs.cs" company="Exiled Team">
+// Copyright (c) Exiled Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Player
+{
+    using API.Enums;
+    using API.Features;
+    using Exiled.Events.EventArgs.Interfaces;
+
+    /// <summary>
+    /// Contains all information after freeing a handcuffed player.
+    /// </summary>
+    public class RemovedHandcuffsEventArgs : IPlayerEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemovedHandcuffsEventArgs" /> class.
+        /// </summary>
+        /// <param name="cuffer">The cuffer player.</param>
+        /// <param name="target">The target player to be uncuffed.</param>
+        /// <param name="uncuffReason">The reason of removing handcuffs.</param>
+        public RemovedHandcuffsEventArgs(Player cuffer, Player target, UncuffReason uncuffReason)
+        {
+            Player = cuffer;
+            Target = target;
+            UncuffReason = uncuffReason;
+        }
+
+        /// <summary>
+        /// Gets the target player to be cuffed.
+        /// </summary>
+        public Player Target { get; }
+
+        /// <summary>
+        /// Gets the cuffer player.
+        /// </summary>
+        public Player Player { get; }
+
+        /// <summary>
+        /// Gets the reason of removing handcuffs.
+        /// </summary>
+        public UncuffReason UncuffReason { get; }
+    }
+}
\ No newline at end of file
diff --git a/EXILED/Exiled.Events/EventArgs/Player/RemovingHandcuffsEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/RemovingHandcuffsEventArgs.cs
index 1d3a663e1e..c375bb4b7f 100644
--- a/EXILED/Exiled.Events/EventArgs/Player/RemovingHandcuffsEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Player/RemovingHandcuffsEventArgs.cs
@@ -37,8 +37,9 @@ public RemovingHandcuffsEventArgs(Player cuffer, Player target, UncuffReason unc
         public Player Target { get; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether or not the player can be handcuffed.
+        /// Gets or sets a value indicating whether or not the player can be handcuffed. Denying the event will only have an effect when <see cref="UncuffReason" /> is <see cref="UncuffReason.Player" />  until next major update.
         /// </summary>
+        /// TODO: Update docs and patches
         public bool IsAllowed { get; set; }
 
         /// <summary>
diff --git a/EXILED/Exiled.Events/Handlers/Player.cs b/EXILED/Exiled.Events/Handlers/Player.cs
index aca07ce6e1..016bdf644c 100644
--- a/EXILED/Exiled.Events/Handlers/Player.cs
+++ b/EXILED/Exiled.Events/Handlers/Player.cs
@@ -223,6 +223,11 @@ public class Player
         /// </summary>
         public static Event<RemovingHandcuffsEventArgs> RemovingHandcuffs { get; set; } = new();
 
+        /// <summary>
+        /// Invoked after freeing a handcuffed <see cref="API.Features.Player"/>.
+        /// </summary>
+        public static Event<RemovedHandcuffsEventArgs> RemovedHandcuffs { get; set; } = new();
+
         /// <summary>
         /// Invoked before a <see cref="API.Features.Player"/> escapes.
         /// </summary>
@@ -704,6 +709,12 @@ public class Player
         /// <param name="ev">The <see cref="RemovingHandcuffsEventArgs"/> instance.</param>
         public static void OnRemovingHandcuffs(RemovingHandcuffsEventArgs ev) => RemovingHandcuffs.InvokeSafely(ev);
 
+        /// <summary>
+        /// Called after freeing a handcuffed <see cref="API.Features.Player"/>.
+        /// </summary>
+        /// <param name="ev">The <see cref="RemovedHandcuffsEventArgs"/> instance.</param>
+        public static void OnRemovedHandcuffs(RemovedHandcuffsEventArgs ev) => RemovedHandcuffs.InvokeSafely(ev);
+
         /// <summary>
         /// Called before a <see cref="API.Features.Player"/> escapes.
         /// </summary>
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/ProcessDisarmMessage.cs b/EXILED/Exiled.Events/Patches/Events/Player/ProcessDisarmMessage.cs
index 0ce5d9e284..a3805d33db 100644
--- a/EXILED/Exiled.Events/Patches/Events/Player/ProcessDisarmMessage.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Player/ProcessDisarmMessage.cs
@@ -27,10 +27,11 @@ namespace Exiled.Events.Patches.Events.Player
 
     /// <summary>
     /// Patches <see cref="DisarmingHandlers.ServerProcessDisarmMessage" />.
-    /// Adds the <see cref="Handlers.Player.Handcuffing" /> and <see cref="Handlers.Player.RemovingHandcuffs" /> events.
+    /// Adds the <see cref="Handlers.Player.Handcuffing" />, <see cref="Handlers.Player.RemovingHandcuffs" />, and <see cref="Handlers.Player.RemovedHandcuffs" /> events.
     /// </summary>
     [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.Handcuffing))]
     [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.RemovingHandcuffs))]
+    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.RemovedHandcuffs))]
     [HarmonyPatch(typeof(DisarmingHandlers), nameof(DisarmingHandlers.ServerProcessDisarmMessage))]
     internal static class ProcessDisarmMessage
     {
@@ -47,6 +48,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 index,
                 new[]
                 {
+                    // Invoking RemovingHandcuffs event
                     // Player.Get(referenceHub)
                     new CodeInstruction(OpCodes.Ldloc_0),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
@@ -73,6 +75,25 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     //    return;
                     new(OpCodes.Callvirt, PropertyGetter(typeof(RemovingHandcuffsEventArgs), nameof(RemovingHandcuffsEventArgs.IsAllowed))),
                     new(OpCodes.Brfalse_S, returnLabel),
+
+                    // Invoking RemovedHandcuffs event
+                    // Player.Get(referenceHub)
+                    new(OpCodes.Ldloc_0),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // Player.Get(msg.PlayerToDisarm)
+                    new(OpCodes.Ldarg_1),
+                    new(OpCodes.Ldfld, Field(typeof(DisarmMessage), nameof(DisarmMessage.PlayerToDisarm))),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // UncuffReason.Player
+                    new(OpCodes.Ldc_I4_0),
+
+                    // RemovedHandcuffsEventArgs ev = new(Player, Player, UncuffReason.Player)
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RemovedHandcuffsEventArgs))[0]),
+
+                    // Handlers.Player.OnRemovedHandcuffs(ev)
+                    new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnRemovedHandcuffs))),
                 });
 
             offset = -3;
@@ -83,6 +104,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 index,
                 new[]
                 {
+                    // Invoking Handcuffing event
                     // Player.Get(referenceHub)
                     new CodeInstruction(OpCodes.Ldloc_0).MoveLabelsFrom(newInstructions[index]),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
@@ -119,9 +141,10 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
     /// <summary>
     /// Patches <see cref="DisarmedPlayers.ValidateEntry(DisarmedPlayers.DisarmedEntry)" />.
-    /// Invokes <see cref="Handlers.Player.RemovingHandcuffs" /> event.
+    /// Invokes <see cref="Handlers.Player.RemovingHandcuffs" /> and <see cref="Handlers.Player.RemovedHandcuffs" /> event.
     /// </summary>
     [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.RemovingHandcuffs))]
+    [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.RemovedHandcuffs))]
     [HarmonyPatch(typeof(DisarmedPlayers), nameof(DisarmedPlayers.ValidateEntry))]
     internal static class Uncuff
     {
@@ -138,6 +161,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 index,
                 new[]
                 {
+                    // Invoking RemovingHandcuffs event
                     // Player.Get(Cuffer)
                     new CodeInstruction(OpCodes.Ldloc_1),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
@@ -154,15 +178,36 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
                     // RemovingHandcuffsEventArgs ev = new(Cuffer, Target, UncuffReason.CufferDied, true)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RemovingHandcuffsEventArgs))[0]),
-                    new(OpCodes.Dup),
+
+                    // TODO: Uncomment this part in next major update to prevent breaking changes
+                    // new(OpCodes.Dup),
 
                     // Handlers.Player.OnRemovingHandcuffs(ev)
                     new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnRemovingHandcuffs))),
 
+                    // TODO: Uncomment this part in next major update to prevent breaking changes
                     // if (!ev.IsAllowed)
                     //    return true;
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(RemovingHandcuffsEventArgs), nameof(RemovingHandcuffsEventArgs.IsAllowed))),
-                    new(OpCodes.Brfalse_S, returnLabel),
+                    // new(OpCodes.Callvirt, PropertyGetter(typeof(RemovingHandcuffsEventArgs), nameof(RemovingHandcuffsEventArgs.IsAllowed))),
+                    // new(OpCodes.Brfalse_S, returnLabel),
+
+                    // Invoking RemovedHandcuffs event
+                    // Player.Get(Cuffer)
+                    new CodeInstruction(OpCodes.Ldloc_1),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // Player.Get(Target)
+                    new(OpCodes.Ldloc_0),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // UncuffReason.CufferDied
+                    new(OpCodes.Ldc_I4_2),
+
+                    // RemovedHandcuffsEventArgs ev = new(Cuffer, Target, UncuffReason.CufferDied)
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RemovedHandcuffsEventArgs))[0]),
+
+                    // Handlers.Player.OnRemovedHandcuffs(ev)
+                    new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnRemovedHandcuffs))),
                 });
 
             offset = 5;
@@ -173,6 +218,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 index,
                 new[]
                 {
+                    // Invoking RemovingHandcuffs event
                     // Player.Get(Cuffer)
                     new CodeInstruction(OpCodes.Ldloc_1),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
@@ -189,15 +235,36 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
                     // RemovingHandcuffsEventArgs ev = new(Cuffer, Target, UncuffReason.CufferDied, true)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RemovingHandcuffsEventArgs))[0]),
-                    new(OpCodes.Dup),
+
+                    // TODO: Uncomment this part in next major update to prevent breaking changes
+                    // new(OpCodes.Dup),
 
                     // Handlers.Player.OnRemovingHandcuffs(ev)
                     new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnRemovingHandcuffs))),
 
+                    // TODO: Uncomment this part in next major update to prevent breaking changes
                     // if (!ev.IsAllowed)
                     //    return true;
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(RemovingHandcuffsEventArgs), nameof(RemovingHandcuffsEventArgs.IsAllowed))),
-                    new(OpCodes.Brfalse_S, returnLabel),
+                    // new(OpCodes.Callvirt, PropertyGetter(typeof(RemovingHandcuffsEventArgs), nameof(RemovingHandcuffsEventArgs.IsAllowed))),
+                    // new(OpCodes.Brfalse_S, returnLabel),
+
+                    // Invoking RemovedHandcuffs event
+                    // Player.Get(Cuffer)
+                    new CodeInstruction(OpCodes.Ldloc_1),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // Player.Get(Target)
+                    new(OpCodes.Ldloc_0),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // UncuffReason.CufferDied
+                    new(OpCodes.Ldc_I4_2),
+
+                    // RemovedHandcuffsEventArgs ev = new(Cuffer, Target, UncuffReason.CufferDied)
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RemovedHandcuffsEventArgs))[0]),
+
+                    // Handlers.Player.OnRemovedHandcuffs(ev)
+                    new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnRemovedHandcuffs))),
                 });
 
             offset = 3;
@@ -208,6 +275,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 index,
                 new[]
                 {
+                    // Invoking RemovingHandcuffs event
                     // Player.Get(Cuffer)
                     new CodeInstruction(OpCodes.Ldloc_1),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
@@ -224,15 +292,36 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
                     // RemovingHandcuffsEventArgs ev = new(Cuffer, Target, UncuffReason.OutOfRange, true)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RemovingHandcuffsEventArgs))[0]),
-                    new(OpCodes.Dup),
+
+                    // TODO: Uncomment this part in next major update to prevent breaking changes
+                    // new(OpCodes.Dup),
 
                     // Handlers.Player.OnRemovingHandcuffs(ev)
                     new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnRemovingHandcuffs))),
 
+                    // TODO: Uncomment this part in next major update to prevent breaking changes
                     // if (!ev.IsAllowed)
                     //    return true;
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(RemovingHandcuffsEventArgs), nameof(RemovingHandcuffsEventArgs.IsAllowed))),
-                    new(OpCodes.Brfalse_S, returnLabel),
+                    // new(OpCodes.Callvirt, PropertyGetter(typeof(RemovingHandcuffsEventArgs), nameof(RemovingHandcuffsEventArgs.IsAllowed))),
+                    // new(OpCodes.Brfalse_S, returnLabel),
+
+                    // Invoking RemovedHandcuffs event
+                    // Player.Get(Cuffer)
+                    new CodeInstruction(OpCodes.Ldloc_1),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // Player.Get(Target)
+                    new(OpCodes.Ldloc_0),
+                    new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
+
+                    // UncuffReason.CufferDied
+                    new(OpCodes.Ldc_I4_2),
+
+                    // RemovedHandcuffsEventArgs ev = new(Cuffer, Target, UncuffReason.OutOfRange)
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(RemovedHandcuffsEventArgs))[0]),
+
+                    // Handlers.Player.OnRemovedHandcuffs(ev)
+                    new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnRemovedHandcuffs))),
                 });
 
             newInstructions[newInstructions.Count - 2].labels.Add(returnLabel);

From 19085c1af4c34cb451322a43173f74b56f0bf60c Mon Sep 17 00:00:00 2001
From: Misaka-ZeroTwo <45165615+Misaka-ZeroTwo@users.noreply.github.com>
Date: Tue, 6 Aug 2024 19:10:43 +0800
Subject: [PATCH 5/5] docs

---
 .../EventArgs/Player/RemovedHandcuffsEventArgs.cs      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/EXILED/Exiled.Events/EventArgs/Player/RemovedHandcuffsEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/RemovedHandcuffsEventArgs.cs
index 06468b5d1c..ee152fb347 100644
--- a/EXILED/Exiled.Events/EventArgs/Player/RemovedHandcuffsEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Player/RemovedHandcuffsEventArgs.cs
@@ -20,8 +20,8 @@ public class RemovedHandcuffsEventArgs : IPlayerEvent
         /// Initializes a new instance of the <see cref="RemovedHandcuffsEventArgs" /> class.
         /// </summary>
         /// <param name="cuffer">The cuffer player.</param>
-        /// <param name="target">The target player to be uncuffed.</param>
-        /// <param name="uncuffReason">The reason of removing handcuffs.</param>
+        /// <param name="target">The target player was uncuffed.</param>
+        /// <param name="uncuffReason">The reason for removing the handcuffs.</param>
         public RemovedHandcuffsEventArgs(Player cuffer, Player target, UncuffReason uncuffReason)
         {
             Player = cuffer;
@@ -30,7 +30,7 @@ public RemovedHandcuffsEventArgs(Player cuffer, Player target, UncuffReason uncu
         }
 
         /// <summary>
-        /// Gets the target player to be cuffed.
+        /// Gets the  target player to be cuffed.
         /// </summary>
         public Player Target { get; }
 
@@ -40,8 +40,8 @@ public RemovedHandcuffsEventArgs(Player cuffer, Player target, UncuffReason uncu
         public Player Player { get; }
 
         /// <summary>
-        /// Gets the reason of removing handcuffs.
+        /// Gets the reason for removing handcuffs.
         /// </summary>
         public UncuffReason UncuffReason { get; }
     }
-}
\ No newline at end of file
+}