Skip to content

spawn fix #153

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

Closed
1312255201 wants to merge 6 commits into from
Closed

spawn fix #153

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f6498ec
spawn fix
1312255201 Oct 25, 2024
f0bf4f0
Fix Blank
1312255201 Oct 25, 2024
20afe9d
add nothing
1312255201 Oct 25, 2024
cba06fc
add nothing
1312255201 Oct 25, 2024
700559e
add nothing
1312255201 Oct 25, 2024
56883a8
My bad
1312255201 Oct 25, 2024
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
22 changes: 21 additions & 1 deletion 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 @@ -45,6 +45,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
Label continueLabel = generator.DefineLabel();
Label jmp = generator.DefineLabel();
Label skip = generator.DefineLabel();
Label nothing = generator.DefineLabel();

LocalBuilder changingRoleEventArgs = generator.DeclareLocal(typeof(ChangingRoleEventArgs));
LocalBuilder player = generator.DeclareLocal(typeof(API.Features.Player));
Expand Down Expand Up @@ -156,6 +157,22 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
newInstructions.Count - 1,
new[]
{
// if (player == null)
// goto nothing;
new CodeInstruction(OpCodes.Ldloc_S, player.LocalIndex),
new(OpCodes.Brfalse_S, nothing),

// if (player.ReferenceHub == null)
// goto nothing;
new CodeInstruction(OpCodes.Ldloc_S, player.LocalIndex),
new CodeInstruction(OpCodes.Callvirt, PropertyGetter(typeof(API.Features.Player), nameof(API.Features.Player.ReferenceHub))),
new(OpCodes.Brfalse_S, nothing),

// if (ReferenceHub.LocalHub == null)
// goto nothing;
new CodeInstruction(OpCodes.Call, PropertyGetter(typeof(ReferenceHub), nameof(ReferenceHub.LocalHub))),
new(OpCodes.Brfalse_S, nothing),

// if (player.ReferenceHub == ReferenceHub.LocalHub)
// goto skip;
new(OpCodes.Ldloc_S, player.LocalIndex),
Expand All @@ -164,6 +181,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
new(OpCodes.Call, Method(typeof(ReferenceHub), "op_Equality")),
new(OpCodes.Brtrue_S, skip),

// nothing
new CodeInstruction(OpCodes.Nop).WithLabels(nothing),

// player
new(OpCodes.Ldloc_S, player.LocalIndex),

Expand Down Expand Up @@ -259,4 +279,4 @@ private static void ChangeInventory(ChangingRoleEventArgs ev)
}
}
}
}
}