Skip to content
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.

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

Adds sanity checks for bottle duping over items and prevents the issue causing Big Goron to not give the player the Keg License. #605

Merged
merged 4 commits into from
May 31, 2024

Conversation

zmarotrix
Copy link
Contributor

@zmarotrix zmarotrix commented May 29, 2024

Adds sanity checks for bottle duping and prevents the issue causing Big Goron to not give the player the Keg License.

Build Artifacts

@Archez
Copy link
Contributor

Archez commented May 30, 2024

Would you be able to rebase these changes onto the develop-rika branch and point the PR to it. We like to target bug fixes to the release named branches.

@zmarotrix zmarotrix changed the base branch from develop to develop-rika May 30, 2024 15:24
@zmarotrix
Copy link
Contributor Author

Would you be able to rebase these changes onto the develop-rika branch and point the PR to it. We like to target bug fixes to the release named branches.

Done. Let me know if anything else is needed.

@garrettjoecox
Copy link
Contributor

Looks like you pointed to the right branch but without a rebase, when rebased properly you should only see your 4 commits

@inspectredc
Copy link
Contributor

Will handle the rebase so we can get this in for next release

zmarotrix added 4 commits May 31, 2024 14:58
Adds sanity checks for bottle duping and prevents the issue causing Big Goron to not give the player the Keg License.
More formatting trying to work around this Clang stuff while working from Github.
@louist103 louist103 merged commit a39a9a5 into HarbourMasters:develop-rika May 31, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants