Skip to content

Fix ThrownPotion#splash NPE when called from API #13734

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.

Sign up for GitHub

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

Closed
dreamy32 wants to merge 1 commit into from
+2 −1
Closed

Fix ThrownPotion#splash NPE when called from API #13734

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...minecraft/world/entity/projectile/throwableitemprojectile/AbstractThrownPotion.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/projectile/throwableitemprojectile/AbstractThrownPotion.java
+++ b/net/minecraft/world/entity/projectile/throwableitemprojectile/AbstractThrownPotion.java
@@ -68,56 +_,97 @@
@@ -68,56 +_,98 @@
@Override
protected void onHit(HitResult result) {
super.onHit(result);
Expand All @@ -10,6 +10,7 @@
+
+ public void splash(HitResult result) {
+ // Paper end - More projectile API
+ if (result == null) result = BlockHitResult.miss(this.position(), Direction.UP, this.blockPosition()); // Paper - More projectile API; default to entity position for API calls
if (this.level() instanceof ServerLevel serverLevel) {
ItemStack item = this.getItem();
PotionContents potionContents = item.getOrDefault(DataComponents.POTION_CONTENTS, PotionContents.EMPTY);
Expand Down