Skip to content

fix: OnShooting target freeze #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
louis1706 merged 1 commit into from
Feb 17, 2025
Merged

fix: OnShooting target freeze #438

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 44 additions & 22 deletions EXILED/Exiled.Events/Patches/Events/Player/Shooting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

namespace Exiled.Events.Patches.Events.Player
{
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Reflection.Emit;
Expand Down Expand Up @@ -34,8 +35,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);

Label returnLabel = generator.DefineLabel();
Label continueLabel1 = generator.DefineLabel();
Label continueLabel2 = generator.DefineLabel();

/*
[] <= Here
Expand All @@ -59,37 +58,60 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
typeof(ShootingEventArgs),
new[] { typeof(InventorySystem.Items.Firearms.Firearm), typeof(ShotBacktrackData).MakeByRefType() });

CodeInstruction[] patchInstructions1 = GetInstructions(continueLabel1);
CodeInstruction[] patchInstructions2 = GetInstructions(continueLabel2);
Label continueLabel1 = generator.DefineLabel();

CodeInstruction[] noTargetInstructions =
{
// ShootingEventArgs ev = new(firearm, this)
new(OpCodes.Ldarg_1),
new(OpCodes.Ldarg_0),
new(OpCodes.Newobj, constructorInfo),

// Handlers.Player.OnShooting(ev)
new(OpCodes.Dup), // Dup to keep ev on the stack
new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnShooting))),

// if (!ev.IsAllowed) return
new(OpCodes.Callvirt, PropertyGetter(typeof(ShootingEventArgs), nameof(ShootingEventArgs.IsAllowed))),
new(OpCodes.Brtrue_S, continueLabel1),

new(OpCodes.Leave_S, returnLabel),
new CodeInstruction(OpCodes.Nop).WithLabels(continueLabel1),
};

Label continueLabel2 = generator.DefineLabel();

CodeInstruction[] hasTargetInstructions =
{
// ShootingEventArgs ev = new(firearm, this)
new(OpCodes.Ldarg_1),
new(OpCodes.Ldarg_0),
new(OpCodes.Newobj, constructorInfo),

CodeInstruction[] GetInstructions(Label continueLabel) =>
new[]
{
// ShootingEventArgs ev = new(firearm, this)
new(OpCodes.Ldarg_1),
new(OpCodes.Ldarg_0),
new(OpCodes.Newobj, constructorInfo),
// Handlers.Player.OnShooting(ev)
new(OpCodes.Dup), // Dup to keep ev on the stack
new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnShooting))),

// Handlers.Player.OnShooting(ev)
new(OpCodes.Dup), // Dup to keep ev on the stack
new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnShooting))),
// if (!ev.IsAllowed) return
new(OpCodes.Callvirt, PropertyGetter(typeof(ShootingEventArgs), nameof(ShootingEventArgs.IsAllowed))),
new(OpCodes.Brtrue_S, continueLabel2),

// if (!ev.IsAllowed) return
new(OpCodes.Callvirt, PropertyGetter(typeof(ShootingEventArgs), nameof(ShootingEventArgs.IsAllowed))),
new(OpCodes.Brtrue_S, continueLabel),
new(OpCodes.Leave_S, returnLabel),
// Dispose target FpcBacktracker
new(OpCodes.Ldloc_S, 5),
new(OpCodes.Callvirt, Method(typeof(IDisposable), nameof(IDisposable.Dispose))),

new CodeInstruction(OpCodes.Nop).WithLabels(continueLabel),
};
new(OpCodes.Leave_S, returnLabel),
new CodeInstruction(OpCodes.Nop).WithLabels(continueLabel2),
};

newInstructions.InsertRange( // noTargetIndex goes first because it's higher then hasTargetIndex so it won't mess it up
noTargetIndex,
patchInstructions1);
noTargetInstructions);
newInstructions[noTargetIndex].WithLabels(noTargetLabels);

newInstructions.InsertRange(
hasTargetIndex,
patchInstructions2);
hasTargetInstructions);

newInstructions[newInstructions.Count - 1].WithLabels(returnLabel);

Expand Down