Skip to content

fix: Escaping Exiled and LabAPI bug different way #589

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 3 commits into from
Jul 31, 2025
Merged

fix: Escaping Exiled and LabAPI bug different way #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a9db88
.
MS-crew Jul 11, 2025
26dd885
.
MS-crew Jul 11, 2025
212e68d
Merge branch 'dev' into EscapeFix
MS-crew Jul 11, 2025
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
2 changes: 1 addition & 1 deletion EXILED/Exiled.Events/EventArgs/Player/EscapingEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public EscapingEventArgs(ReferenceHub referenceHub, RoleTypeId newRole, EscapeSc
Player = Player.Get(referenceHub);
NewRole = newRole;
EscapeScenario = escapeScenario;
IsAllowed = true;
IsAllowed = escapeScenario is not EscapeScenario.None;
}

/// <summary>
Expand Down
7 changes: 3 additions & 4 deletions EXILED/Exiled.Events/Patches/Events/Player/EscapingAndEscaped.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@ namespace Exiled.Events.Patches.Events.Player
using System.Collections.Generic;
using System.Reflection.Emit;

using API.Enums;
using API.Features;
using API.Features.Pools;
using EventArgs.Player;
using Exiled.API.Features.Roles;
using Exiled.Events.Attributes;
using HarmonyLib;
using PlayerRoles.FirstPersonControl;
using LabApi.Events.Arguments.PlayerEvents;

using static HarmonyLib.AccessTools;

Expand All @@ -41,8 +40,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
LocalBuilder ev = generator.DeclareLocal(typeof(EscapingEventArgs));
LocalBuilder role = generator.DeclareLocal(typeof(Role));

int offset = -3;
int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Newobj) + offset;
int offset = 2;
int index = newInstructions.FindIndex(i => i.opcode == OpCodes.Callvirt && i.operand == (object)PropertyGetter(typeof(PlayerEscapingEventArgs), nameof(PlayerEscapingEventArgs.EscapeScenario))) + offset;

newInstructions.InsertRange(
index,
Expand Down