From dc3987d2763518f5259c944c7da2af0fc5b1cd69 Mon Sep 17 00:00:00 2001 From: Vretu-Dev Date: Sun, 29 Mar 2026 16:30:42 +0200 Subject: [PATCH 1/7] ShowingHitMarkerEventArgs --- .../Player/ShowingHitMarkerEventArgs.cs | 66 +++++++++++++++ EXILED/Exiled.Events/Handlers/Player.cs | 11 +++ .../Patches/Events/Player/ShowingHitMarker.cs | 81 +++++++++++++++++++ 3 files changed, 158 insertions(+) create mode 100644 EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs create mode 100644 EXILED/Exiled.Events/Patches/Events/Player/ShowingHitMarker.cs diff --git a/EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs new file mode 100644 index 0000000000..b72cf3c4c2 --- /dev/null +++ b/EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs @@ -0,0 +1,66 @@ +// ----------------------------------------------------------------------- +// +// Copyright (c) ExMod Team. All rights reserved. +// Licensed under the CC BY-SA 3.0 license. +// +// ----------------------------------------------------------------------- + +namespace Exiled.Events.EventArgs.Player +{ + using API.Features; + using Interfaces; + + /// + /// Contains all information before a hitmarker is show to player. + /// + public class ShowingHitMarkerEventArgs : IPlayerEvent, IDeniableEvent + { + /// + /// Initializes a new instance of the class. + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + public ShowingHitMarkerEventArgs(ReferenceHub hub, float size, bool shouldPlayAudio, HitmarkerType hitmarkerType) + { + Player = Player.Get(hub); + Size = size; + ShouldPlayAudio = shouldPlayAudio; + HitmarkerType = hitmarkerType; + } + + /// + /// Gets or sets the player that the hitmarker is being shown to. + /// + public Player Player { get; set; } + + /// + /// Gets or sets the target size multiplier. + /// + public float Size { get; set; } + + /// + /// Gets or sets a value indicating whether the hitmarker sound effect should play. + /// + public bool ShouldPlayAudio { get; set; } + + /// + /// Gets or sets a the type of the hitmarker. + /// + public HitmarkerType HitmarkerType { get; set; } + + /// + /// Gets or sets a value indicating whether the hitmarker should be shown. + /// + public bool IsAllowed { get; set; } = true; + } +} \ No newline at end of file diff --git a/EXILED/Exiled.Events/Handlers/Player.cs b/EXILED/Exiled.Events/Handlers/Player.cs index c03bcebebf..34f5fb1049 100644 --- a/EXILED/Exiled.Events/Handlers/Player.cs +++ b/EXILED/Exiled.Events/Handlers/Player.cs @@ -32,6 +32,11 @@ public class Player /// public static Event Hit { get; set; } = new (); + /// + /// Invoked before a player is shown a hitmarker. + /// + public static Event ShowingHitMarker { get; set; } = new (); + /// /// Invoked before authenticating a . /// @@ -1423,6 +1428,12 @@ public static void OnItemRemoved(ReferenceHub referenceHub, InventorySystem.Item /// The instance. public static void OnHit(HitEventArgs ev) => Hit.InvokeSafely(ev); + /// + /// Called before a player is shown a hitmarker. + /// + /// The instance. + public static void OnShowingHitMarker(ShowingHitMarkerEventArgs ev) => ShowingHitMarker.InvokeSafely(ev); + /// /// Called before Emergency Release Button is pressed. /// diff --git a/EXILED/Exiled.Events/Patches/Events/Player/ShowingHitMarker.cs b/EXILED/Exiled.Events/Patches/Events/Player/ShowingHitMarker.cs new file mode 100644 index 0000000000..5eef6831d0 --- /dev/null +++ b/EXILED/Exiled.Events/Patches/Events/Player/ShowingHitMarker.cs @@ -0,0 +1,81 @@ +// ----------------------------------------------------------------------- +// +// Copyright (c) ExMod Team. All rights reserved. +// Licensed under the CC BY-SA 3.0 license. +// +// ----------------------------------------------------------------------- + +namespace Exiled.Events.Patches.Events.Player +{ + using System.Collections.Generic; + using System.Reflection.Emit; + + using Exiled.API.Features.Pools; + using Exiled.Events.Attributes; + using Exiled.Events.EventArgs.Player; + using HarmonyLib; + + using static HarmonyLib.AccessTools; + + /// + /// Patch the method. + /// Adds the event. + /// + [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.ShowingHitMarker))] + [HarmonyPatch(typeof(Hitmarker), nameof(Hitmarker.SendHitmarkerDirectly), typeof(ReferenceHub), typeof(float), typeof(bool), typeof(HitmarkerType))] + internal static class ShowingHitMarker + { + private static IEnumerable Transpiler(IEnumerable instructions, ILGenerator generator) + { + List newInstructions = ListPool.Pool.Get(instructions); + + LocalBuilder ev = generator.DeclareLocal(typeof(ShowingHitMarkerEventArgs)); + Label continueLabel = generator.DefineLabel(); + + int offset = 1; + + int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + offset; + + newInstructions.InsertRange(index, new[] + { + // ShowingHitMarkerEventArgs ev = new(hub, size, playAudio, hitmarkerType) + new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]), + new(OpCodes.Ldarg_1), + new(OpCodes.Ldarg_2), + new(OpCodes.Ldarg_3), + new(OpCodes.Newobj, GetDeclaredConstructors(typeof(ShowingHitMarkerEventArgs))[0]), + new(OpCodes.Dup), + new(OpCodes.Stloc_S, ev.LocalIndex), + + // Handlers.Player.OnShowingHitMarker(ev) + new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnShowingHitMarker))), + + // if (!ev.IsAllowed) return; + new(OpCodes.Ldloc_S, ev.LocalIndex), + new(OpCodes.Callvirt, PropertyGetter(typeof(ShowingHitMarkerEventArgs), nameof(ShowingHitMarkerEventArgs.IsAllowed))), + new(OpCodes.Brtrue_S, continueLabel), + new(OpCodes.Ret), + + // size = ev.Size; + new CodeInstruction(OpCodes.Ldloc_S, ev.LocalIndex).WithLabels(continueLabel), + new(OpCodes.Callvirt, PropertyGetter(typeof(ShowingHitMarkerEventArgs), nameof(ShowingHitMarkerEventArgs.Size))), + new(OpCodes.Starg_S, 1), + + // playAudio = ev.ShouldPlayAudio; + new(OpCodes.Ldloc_S, ev.LocalIndex), + new(OpCodes.Callvirt, PropertyGetter(typeof(ShowingHitMarkerEventArgs), nameof(ShowingHitMarkerEventArgs.ShouldPlayAudio))), + new(OpCodes.Starg_S, 2), + + // hitmarkerType = ev.HitmarkerType; + new(OpCodes.Ldloc_S, ev.LocalIndex), + new(OpCodes.Callvirt, PropertyGetter(typeof(ShowingHitMarkerEventArgs), nameof(ShowingHitMarkerEventArgs.HitmarkerType))), + new(OpCodes.Starg_S, 3), + }); + + for (int z = 0; z < newInstructions.Count; z++) + yield return newInstructions[z]; + + ListPool.Pool.Return(newInstructions); + } + } +} From b2cf30630688e0c52b8d33146d4843a7834d8e58 Mon Sep 17 00:00:00 2001 From: Yamato <66829532+louis1706@users.noreply.github.com> Date: Thu, 16 Jul 2026 19:06:54 +0200 Subject: [PATCH 2/7] requested by multiple DevBoy --- EXILED/Exiled.Events/Events.cs | 2 + EXILED/Exiled.Events/Handlers/Player.cs | 5 +- .../Patches/Events/Player/ShowingHitMarker.cs | 81 ------------------- 3 files changed, 5 insertions(+), 83 deletions(-) delete mode 100644 EXILED/Exiled.Events/Patches/Events/Player/ShowingHitMarker.cs diff --git a/EXILED/Exiled.Events/Events.cs b/EXILED/Exiled.Events/Events.cs index c941abd7ca..86e1c815fa 100644 --- a/EXILED/Exiled.Events/Events.cs +++ b/EXILED/Exiled.Events/Events.cs @@ -92,6 +92,7 @@ public override void OnEnabled() LabApi.Events.Handlers.PlayerEvents.ReloadingWeapon += Handlers.Player.OnReloadingWeapon; LabApi.Events.Handlers.PlayerEvents.UnloadingWeapon += Handlers.Player.OnUnloadingWeapon; + LabApi.Events.Handlers.PlayerEvents.SendingHitmarker += Handlers.Player.OnShowingHitMarker; LabApi.Events.Handlers.Scp127Events.Talking += Handlers.Scp127.OnTalking; LabApi.Events.Handlers.Scp127Events.Talked += Handlers.Scp127.OnTalked; @@ -135,6 +136,7 @@ public override void OnDisabled() LabApi.Events.Handlers.PlayerEvents.ReloadingWeapon -= Handlers.Player.OnReloadingWeapon; LabApi.Events.Handlers.PlayerEvents.UnloadingWeapon -= Handlers.Player.OnUnloadingWeapon; + LabApi.Events.Handlers.PlayerEvents.SendingHitmarker -= Handlers.Player.OnShowingHitMarker; LabApi.Events.Handlers.Scp127Events.Talking -= Handlers.Scp127.OnTalking; LabApi.Events.Handlers.Scp127Events.Talked -= Handlers.Scp127.OnTalked; diff --git a/EXILED/Exiled.Events/Handlers/Player.cs b/EXILED/Exiled.Events/Handlers/Player.cs index 34f5fb1049..db3401e66d 100644 --- a/EXILED/Exiled.Events/Handlers/Player.cs +++ b/EXILED/Exiled.Events/Handlers/Player.cs @@ -1431,8 +1431,9 @@ public static void OnItemRemoved(ReferenceHub referenceHub, InventorySystem.Item /// /// Called before a player is shown a hitmarker. /// - /// The instance. - public static void OnShowingHitMarker(ShowingHitMarkerEventArgs ev) => ShowingHitMarker.InvokeSafely(ev); + /// The instance. + public static void OnShowingHitMarker(PlayerSendingHitmarkerEventArgs ev) + => ShowingHitMarker.InvokeSafely(new(ev.Player.ReferenceHub, ev.Size, ev.PlayAudio, ev.Hitmarker)); /// /// Called before Emergency Release Button is pressed. diff --git a/EXILED/Exiled.Events/Patches/Events/Player/ShowingHitMarker.cs b/EXILED/Exiled.Events/Patches/Events/Player/ShowingHitMarker.cs deleted file mode 100644 index 5eef6831d0..0000000000 --- a/EXILED/Exiled.Events/Patches/Events/Player/ShowingHitMarker.cs +++ /dev/null @@ -1,81 +0,0 @@ -// ----------------------------------------------------------------------- -// -// Copyright (c) ExMod Team. All rights reserved. -// Licensed under the CC BY-SA 3.0 license. -// -// ----------------------------------------------------------------------- - -namespace Exiled.Events.Patches.Events.Player -{ - using System.Collections.Generic; - using System.Reflection.Emit; - - using Exiled.API.Features.Pools; - using Exiled.Events.Attributes; - using Exiled.Events.EventArgs.Player; - using HarmonyLib; - - using static HarmonyLib.AccessTools; - - /// - /// Patch the method. - /// Adds the event. - /// - [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.ShowingHitMarker))] - [HarmonyPatch(typeof(Hitmarker), nameof(Hitmarker.SendHitmarkerDirectly), typeof(ReferenceHub), typeof(float), typeof(bool), typeof(HitmarkerType))] - internal static class ShowingHitMarker - { - private static IEnumerable Transpiler(IEnumerable instructions, ILGenerator generator) - { - List newInstructions = ListPool.Pool.Get(instructions); - - LocalBuilder ev = generator.DeclareLocal(typeof(ShowingHitMarkerEventArgs)); - Label continueLabel = generator.DefineLabel(); - - int offset = 1; - - int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + offset; - - newInstructions.InsertRange(index, new[] - { - // ShowingHitMarkerEventArgs ev = new(hub, size, playAudio, hitmarkerType) - new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]), - new(OpCodes.Ldarg_1), - new(OpCodes.Ldarg_2), - new(OpCodes.Ldarg_3), - new(OpCodes.Newobj, GetDeclaredConstructors(typeof(ShowingHitMarkerEventArgs))[0]), - new(OpCodes.Dup), - new(OpCodes.Stloc_S, ev.LocalIndex), - - // Handlers.Player.OnShowingHitMarker(ev) - new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnShowingHitMarker))), - - // if (!ev.IsAllowed) return; - new(OpCodes.Ldloc_S, ev.LocalIndex), - new(OpCodes.Callvirt, PropertyGetter(typeof(ShowingHitMarkerEventArgs), nameof(ShowingHitMarkerEventArgs.IsAllowed))), - new(OpCodes.Brtrue_S, continueLabel), - new(OpCodes.Ret), - - // size = ev.Size; - new CodeInstruction(OpCodes.Ldloc_S, ev.LocalIndex).WithLabels(continueLabel), - new(OpCodes.Callvirt, PropertyGetter(typeof(ShowingHitMarkerEventArgs), nameof(ShowingHitMarkerEventArgs.Size))), - new(OpCodes.Starg_S, 1), - - // playAudio = ev.ShouldPlayAudio; - new(OpCodes.Ldloc_S, ev.LocalIndex), - new(OpCodes.Callvirt, PropertyGetter(typeof(ShowingHitMarkerEventArgs), nameof(ShowingHitMarkerEventArgs.ShouldPlayAudio))), - new(OpCodes.Starg_S, 2), - - // hitmarkerType = ev.HitmarkerType; - new(OpCodes.Ldloc_S, ev.LocalIndex), - new(OpCodes.Callvirt, PropertyGetter(typeof(ShowingHitMarkerEventArgs), nameof(ShowingHitMarkerEventArgs.HitmarkerType))), - new(OpCodes.Starg_S, 3), - }); - - for (int z = 0; z < newInstructions.Count; z++) - yield return newInstructions[z]; - - ListPool.Pool.Return(newInstructions); - } - } -} From cf713394470f06f176a32f43bb4edc633b5bc92d Mon Sep 17 00:00:00 2001 From: Yamato <66829532+louis1706@users.noreply.github.com> Date: Thu, 16 Jul 2026 19:11:59 +0200 Subject: [PATCH 3/7] Oups --- EXILED/Exiled.Events/Handlers/Player.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/EXILED/Exiled.Events/Handlers/Player.cs b/EXILED/Exiled.Events/Handlers/Player.cs index db3401e66d..30139ff0aa 100644 --- a/EXILED/Exiled.Events/Handlers/Player.cs +++ b/EXILED/Exiled.Events/Handlers/Player.cs @@ -1431,9 +1431,18 @@ public static void OnItemRemoved(ReferenceHub referenceHub, InventorySystem.Item /// /// Called before a player is shown a hitmarker. /// - /// The instance. - public static void OnShowingHitMarker(PlayerSendingHitmarkerEventArgs ev) - => ShowingHitMarker.InvokeSafely(new(ev.Player.ReferenceHub, ev.Size, ev.PlayAudio, ev.Hitmarker)); + /// The instance. + public static void OnShowingHitMarker(PlayerSendingHitmarkerEventArgs labEv) + { + if (!ShowingHitMarker.Patched) + return; + + ShowingHitMarkerEventArgs ev = new(labEv.Player.ReferenceHub, labEv.Size, labEv.PlayAudio, labEv.Hitmarker) + ShowingHitMarker.InvokeSafely(ev); + labEv.Size = ev.Size; + labEv.PlayAudio = ev.ShouldPlayAudio; + labEv.Hitmarker = ev.HitmarkerType; + } /// /// Called before Emergency Release Button is pressed. From 81a684611b63ceb7ee9f366fea6ab7a776c47f5d Mon Sep 17 00:00:00 2001 From: Yamato <66829532+louis1706@users.noreply.github.com> Date: Thu, 16 Jul 2026 19:13:36 +0200 Subject: [PATCH 4/7] player can't be set --- .../EventArgs/Player/ShowingHitMarkerEventArgs.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs index b72cf3c4c2..b392c95fcb 100644 --- a/EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs +++ b/EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs @@ -39,9 +39,9 @@ public ShowingHitMarkerEventArgs(ReferenceHub hub, float size, bool shouldPlayAu } /// - /// Gets or sets the player that the hitmarker is being shown to. + /// Gets the player that the hitmarker is being shown to. /// - public Player Player { get; set; } + public Player Player { get; } /// /// Gets or sets the target size multiplier. From 15dd861178eda5b2ccc81e085e15746388575240 Mon Sep 17 00:00:00 2001 From: Yamato <66829532+louis1706@users.noreply.github.com> Date: Thu, 16 Jul 2026 19:15:20 +0200 Subject: [PATCH 5/7] I missed IsAllowed --- EXILED/Exiled.Events/Handlers/Player.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/EXILED/Exiled.Events/Handlers/Player.cs b/EXILED/Exiled.Events/Handlers/Player.cs index 30139ff0aa..fc08c9d9b2 100644 --- a/EXILED/Exiled.Events/Handlers/Player.cs +++ b/EXILED/Exiled.Events/Handlers/Player.cs @@ -1442,6 +1442,7 @@ public static void OnShowingHitMarker(PlayerSendingHitmarkerEventArgs labEv) labEv.Size = ev.Size; labEv.PlayAudio = ev.ShouldPlayAudio; labEv.Hitmarker = ev.HitmarkerType; + labEv.IsAllowed = ev.IsAllowed; } /// From 1be78ab2b4e4ce5e2899809af5805a4ea0f52053 Mon Sep 17 00:00:00 2001 From: Yamato <66829532+louis1706@users.noreply.github.com> Date: Thu, 16 Jul 2026 19:18:01 +0200 Subject: [PATCH 6/7] do not overwrite IsAllowed value without taking previous LabAPIEvent --- .../EventArgs/Player/ShowingHitMarkerEventArgs.cs | 8 ++++++-- EXILED/Exiled.Events/Handlers/Player.cs | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs index b392c95fcb..b0aab33b44 100644 --- a/EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs +++ b/EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs @@ -30,12 +30,16 @@ public class ShowingHitMarkerEventArgs : IPlayerEvent, IDeniableEvent /// /// /// - public ShowingHitMarkerEventArgs(ReferenceHub hub, float size, bool shouldPlayAudio, HitmarkerType hitmarkerType) + /// + /// + /// + public ShowingHitMarkerEventArgs(ReferenceHub hub, float size, bool shouldPlayAudio, HitmarkerType hitmarkerType, bool isAllowed) { Player = Player.Get(hub); Size = size; ShouldPlayAudio = shouldPlayAudio; HitmarkerType = hitmarkerType; + IsAllowed = isAllowed; } /// @@ -61,6 +65,6 @@ public ShowingHitMarkerEventArgs(ReferenceHub hub, float size, bool shouldPlayAu /// /// Gets or sets a value indicating whether the hitmarker should be shown. /// - public bool IsAllowed { get; set; } = true; + public bool IsAllowed { get; set; } } } \ No newline at end of file diff --git a/EXILED/Exiled.Events/Handlers/Player.cs b/EXILED/Exiled.Events/Handlers/Player.cs index fc08c9d9b2..6ab23e7539 100644 --- a/EXILED/Exiled.Events/Handlers/Player.cs +++ b/EXILED/Exiled.Events/Handlers/Player.cs @@ -1437,7 +1437,7 @@ public static void OnShowingHitMarker(PlayerSendingHitmarkerEventArgs labEv) if (!ShowingHitMarker.Patched) return; - ShowingHitMarkerEventArgs ev = new(labEv.Player.ReferenceHub, labEv.Size, labEv.PlayAudio, labEv.Hitmarker) + ShowingHitMarkerEventArgs ev = new(labEv.Player.ReferenceHub, labEv.Size, labEv.PlayAudio, labEv.Hitmarker, labEv.IsAllowed) ShowingHitMarker.InvokeSafely(ev); labEv.Size = ev.Size; labEv.PlayAudio = ev.ShouldPlayAudio; From e8af76ecaa53136d3a6e5d471abb218d225ae380 Mon Sep 17 00:00:00 2001 From: Yamato <66829532+louis1706@users.noreply.github.com> Date: Thu, 16 Jul 2026 20:28:25 +0200 Subject: [PATCH 7/7] missing ' ; ' --- EXILED/Exiled.Events/Handlers/Player.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EXILED/Exiled.Events/Handlers/Player.cs b/EXILED/Exiled.Events/Handlers/Player.cs index e93c8ff741..539c83b657 100644 --- a/EXILED/Exiled.Events/Handlers/Player.cs +++ b/EXILED/Exiled.Events/Handlers/Player.cs @@ -1453,7 +1453,7 @@ public static void OnShowingHitMarker(PlayerSendingHitmarkerEventArgs labEv) if (!ShowingHitMarker.Patched) return; - ShowingHitMarkerEventArgs ev = new(labEv.Player.ReferenceHub, labEv.Size, labEv.PlayAudio, labEv.Hitmarker, labEv.IsAllowed) + ShowingHitMarkerEventArgs ev = new(labEv.Player.ReferenceHub, labEv.Size, labEv.PlayAudio, labEv.Hitmarker, labEv.IsAllowed); ShowingHitMarker.InvokeSafely(ev); labEv.Size = ev.Size; labEv.PlayAudio = ev.ShouldPlayAudio;