Fix cancelled PotionSplashEvent putting out fires #12194
+27
−7
Conversation
This file contains 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
notTamion
force-pushed
the
fix-water-pse-cancel
branch
from
3731523 to
44ec69f
Compare
paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrownPotion.java.patch
Outdated
Show resolved
Hide resolved
paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrownPotion.java.patch
Outdated
Show resolved
Hide resolved
|
It also feels weird to only cancel interaction with fire but still handle redstone thing and everything called by Block#onProjectileHit. So maybe the responsibily should be moved to the ProjectileHitEvent. |
notTamion
force-pushed
the
fix-water-pse-cancel
branch
from
f51ad66 to
662749b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 #11981
i think we should prevent this from happening as to me it seems the only reason this wasn't put where all the other water splash potion logic is is that the onHitBlock method was just convenient for mojang
EDIT: this also provides us the opportunity to expand the WaterBottleSplashEvent, as waterbottles putting out fires is obviously a big part of their behavior.