Skip to content

fix: AnnouncingScpTerminationEventArgs not denying the event when IsA… #806

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

Open
Mrhootyhoot1 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fix: AnnouncingScpTerminationEventArgs not denying the event when IsA… #806

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d0fc0d
fix: AnnouncingScpTerminationEventArgs not denying the event when IsA…
Mrhootyhoot1 Apr 12, 2026
a959f18
Update EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTerminati…
Mrhootyhoot1 Apr 17, 2026
7adc6d6
Update EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTerminati…
Mrhootyhoot1 Apr 17, 2026
334f268
Update EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTerminati…
Mrhootyhoot1 Apr 17, 2026
4b9a82c
Update EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTerminati…
Mrhootyhoot1 Apr 29, 2026
3fc975c
Merge branch 'master' into master
louis1706 May 23, 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
11 changes: 11 additions & 0 deletions EXILED/Exiled.Events/Patches/Events/Map/AnnouncingScpTermination.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi

LocalBuilder cause = generator.DeclareLocal(typeof(string));
LocalBuilder enumerator = generator.DeclareLocal(typeof(IEnumerator<Footprint>));
LocalBuilder footprint = generator.DeclareLocal(typeof(Footprint));

ExceptionBlock beginTry = new(ExceptionBlockType.BeginExceptionBlock);
ExceptionBlock beginFinally = new(ExceptionBlockType.BeginFinallyBlock);
Expand Down Expand Up @@ -78,13 +79,23 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
// start of loop
new CodeInstruction(OpCodes.Ldloc_S, enumerator).WithLabels(loopLabel),
new(OpCodes.Callvirt, PropertyGetter(typeof(IEnumerator<Footprint>), nameof(IEnumerator<Footprint>.Current))),
new(OpCodes.Stloc_S, footprint),
new(OpCodes.Ldloc_S, footprint),
new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(Footprint) })),
new(OpCodes.Ldloc_S, cause),
new(OpCodes.Newobj, Constructor(typeof(AnnouncingScpTerminationEventArgs), new[] { typeof(Player), typeof(string) })),
new(OpCodes.Dup),
new(OpCodes.Dup),
new(OpCodes.Call, Method(typeof(Map), nameof(Map.OnAnnouncingScpTermination))),
new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.TerminationCause))),
new(OpCodes.Stloc_S, cause),
new(OpCodes.Callvirt, PropertyGetter(typeof(AnnouncingScpTerminationEventArgs), nameof(AnnouncingScpTerminationEventArgs.IsAllowed))),
new(OpCodes.Brtrue, entryLabel),

new(OpCodes.Ldarg_0),
new(OpCodes.Ldfld, Field(typeof(CassieScpTerminationAnnouncement), nameof(CassieScpTerminationAnnouncement._victims))),
new(OpCodes.Ldloc_S, footprint),
new(OpCodes.Callvirt, Method(typeof(List<Footprint>), nameof(List<Footprint>.Remove))),

// entry point
new CodeInstruction(OpCodes.Ldloc_S, enumerator).WithLabels(entryLabel),
Expand Down
Loading