Fix Block#applyBoneMeal returning false on success#14019
Closed
rossnoah wants to merge 1 commit into
Closed
Conversation
CraftBlock#applyBoneMeal checked the result via identity against a single InteractionResult constant, which has now broken three times as vanilla changed which success constant the bone meal code returns: - Pre-1.21.2, BoneMealItem returned sidedSuccess(isClientSide), i.e. CONSUME on the server, so the upstream == SUCCESS check was wrong (fixed by comparing against CONSUME in 2021). - The 1.21.2 InteractionResult refactor (24w33a) removed sidedSuccess and the method returned plain SUCCESS, breaking the CONSUME check (fixed by comparing against SUCCESS again in PaperMC#12407). - The 26.1 update changed the server-side crop growth path to return SUCCESS_SERVER, breaking the SUCCESS check once more (PaperMCGH-14012). Use consumesAction() instead, which matches any Success variant and is therefore robust against this class of vanilla change. Fixes PaperMCGH-14012
rossnoah
force-pushed
the
noah/fix-apply-bonemeal-return-value
branch
from
4da33f2 to
dc891c0
Compare
Contributor
|
Duplicate of #14014, I opted to check against Success explicitly but this works too indeed. |
github-project-automation
Bot
moved this from Awaiting review
to Closed
in Paper PR Queue
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.
fixes GH-14012