Skip to content

fix: Npc not calling ChaningRole event #856

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 6 commits into from
Jul 16, 2026
Merged

fix: Npc not calling ChaningRole event #856

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0f1f0dd
fix: Npc not calling ChaningRole event
louis1706 Jul 13, 2026
817ab15
Revert "fix: Npc not calling ChaningRole event"
louis1706 Jul 13, 2026
e5bc02c
real fix
louis1706 Jul 13, 2026
2d884d3
Revert "real fix"
louis1706 Jul 13, 2026
b40eb49
Reapply "fix: Npc not calling ChaningRole event"
louis1706 Jul 13, 2026
c0ef5f3
now useless
louis1706 Jul 13, 2026
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
18 changes: 1 addition & 17 deletions EXILED/Exiled.Events/Patches/Events/Player/ChangingRoleAndSpawned.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);

Label returnLabel = generator.DefineLabel();
Label continueLabel = generator.DefineLabel();
Label jmp = generator.DefineLabel();

LocalBuilder changingRoleEventArgs = generator.DeclareLocal(typeof(ChangingRoleEventArgs));
LocalBuilder player = generator.DeclareLocal(typeof(API.Features.Player));
Expand All @@ -62,21 +60,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
new(OpCodes.Call, Method(typeof(API.Features.Player), nameof(API.Features.Player.Get), new[] { typeof(ReferenceHub) })),
new(OpCodes.Stloc_S, player.LocalIndex),

// if (Player.IsVerified)
// goto jmp
new(OpCodes.Ldloc_S, player.LocalIndex),
new(OpCodes.Callvirt, PropertyGetter(typeof(API.Features.Player), nameof(API.Features.Player.IsVerified))),
new(OpCodes.Brtrue_S, jmp),

// if (!Player.IsNpc)
// goto continueLabel;
new(OpCodes.Ldloc_S, player.LocalIndex),
new(OpCodes.Callvirt, PropertyGetter(typeof(API.Features.Player), nameof(API.Features.Player.IsNPC))),
new(OpCodes.Brfalse_S, continueLabel),

// jmp

@MS-crew MS-crew Jul 16, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this too

// player
new CodeInstruction(OpCodes.Ldloc_S, player.LocalIndex).WithLabels(jmp),
new CodeInstruction(OpCodes.Ldloc_S, player.LocalIndex),

// newRole
new(OpCodes.Ldarg_1),
Expand Down Expand Up @@ -122,8 +108,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
new(OpCodes.Ldloc_S, changingRoleEventArgs.LocalIndex),
new(OpCodes.Callvirt, PropertyGetter(typeof(ChangingRoleEventArgs), nameof(ChangingRoleEventArgs.Player))),
new(OpCodes.Call, Method(typeof(ChangingRoleAndSpawned), nameof(UpdatePlayerRole))),

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

int offset = 1;
Expand Down
Loading