Skip to content

DroppingScp330 Event Fix. #83

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
vladflotsky merged 4 commits into from
Sep 2, 2024
Merged

DroppingScp330 Event Fix. #83

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00a0ba8
Probably fixes it.
Undid-Iridium Aug 30, 2024
3cf8219
Sigh stylecop
Undid-Iridium Aug 30, 2024
43a0618
Merge branch 'dev' into DroppingScp330Event-Fix
louis1706 Aug 30, 2024
f6fdb17
Merge branch 'dev' into DroppingScp330Event-Fix
louis1706 Sep 1, 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
15 changes: 6 additions & 9 deletions EXILED/Exiled.Events/Patches/Events/Scp330/DroppingCandy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,14 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
// scp330Bag
new(OpCodes.Ldloc_1),

// scp330Bag.TryRemove(msg.CandyId)
// Load candy bag array to get CandyKindID
new(OpCodes.Dup),
new(OpCodes.Ldfld, Field(typeof(Scp330Bag), nameof(Scp330Bag.Candies))),
new(OpCodes.Ldarg_1),

// Grab candy ID from network message, and pass it to event args.
new(OpCodes.Ldfld, Field(typeof(SelectScp330Message), nameof(SelectScp330Message.CandyID))),
new(OpCodes.Callvirt, Method(typeof(Scp330Bag), nameof(Scp330Bag.TryRemove))),
new(OpCodes.Ldelem_U1),

// DroppingScp330EventArgs ev = new(Player, Scp330Bag, CandyKindID)
new(OpCodes.Newobj, GetDeclaredConstructors(typeof(DroppingScp330EventArgs))[0]),
Expand All @@ -83,22 +86,16 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
int jumpOverIndex = newInstructions.FindLastIndex(
instruction => instruction.StoresField(Field(typeof(ItemPickupBase), nameof(ItemPickupBase.PreviousOwner)))) + jumpOverOffset;

// Remove TryRemove candy logic since we did it earlier from current location
newInstructions.RemoveRange(jumpOverIndex, 6);

int candyKindIdIndex = 4;

newInstructions.InsertRange(
jumpOverIndex,
new[]
{
// candyKindID = ev.Candy
// candyKindID = ev.Candy, save locally.
new CodeInstruction(OpCodes.Ldloc, ev.LocalIndex),
new(OpCodes.Callvirt, PropertyGetter(typeof(DroppingScp330EventArgs), nameof(DroppingScp330EventArgs.Candy))),
new(OpCodes.Stloc, candyKindIdIndex),

// candyKindID
new(OpCodes.Ldloc, candyKindIdIndex),
});

newInstructions[newInstructions.Count - 1].labels.Add(returnLabel);
Expand Down