Fix leak of shuffled fairy bottle-swipe behavior to other actors#6405
Merged
serprex merged 1 commit intoHarbourMasters:develop-ackbarfrom Mar 24, 2026
Merged
Conversation
serprex
approved these changes
Mar 24, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
VB_BOTTLE_ACTORhook inShuffleFairies.cppwasn't checking the actor id of the actor it was bottling, and since we store the same type of CheckIdentity object for every actor with a check in the ObjectExtension system, it was just grabbing whatever actor you swiped, grabbing its check identity, and giving you the item.This surrounds everything in that hook in
if(actor->id == ACTOR_EN_ELF). I confirmed you can no longer bottle grass and pots but can still bottle fairies.Fixes #6404
Build Artifacts