fix: NPE when a dispenser empties a bucket - #386
Open
fmauNeko wants to merge 1 commit into
Open
Conversation
BucketItem.emptyContents is invoked with a null player by the vanilla bucket dispenser behaviour (DispenseItemBehavior$8). The 1.20.1 backport passed that player straight into the non-null BlockPlaceCallback.place and BlockChangeCallback.changeBlock overloads, so Kotlin's parameter null check threw and killed the server while ticking the block: java.lang.NullPointerException: Parameter specified as non-null is null: method BlockPlaceCallback.place, parameter player Restore the null guards that were dropped in fe7ac87 when the injectors were converted from `LivingEntity user` back to the `Player player` signature 1.20.1 uses, falling back to Sources.REDSTONE as upstream does. logFluidBreak already targets the nullable overload, so it only gains the @nullable annotation to document the contract. Fixes QuiltServerTools#367 Fixes QuiltServerTools#370
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
1 participant
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.
BucketItem.emptyContents is invoked with a null player by the vanilla bucket dispenser behaviour (DispenseItemBehavior$8). The 1.20.1 backport passed that player straight into the non-null BlockPlaceCallback.place and BlockChangeCallback.changeBlock overloads, so Kotlin's parameter null check threw and killed the server while ticking the block:
java.lang.NullPointerException: Parameter specified as non-null is
null: method BlockPlaceCallback.place, parameter player
Restore the null guards that were dropped in fe7ac87 when the injectors were converted from
LivingEntity userback to thePlayer playersignature 1.20.1 uses, falling back to Sources.REDSTONE as upstream does.logFluidBreak already targets the nullable overload, so it only gains the @nullable annotation to document the contract.
Fixes #367
Fixes #370