aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0892-Expand-LingeringPotion-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0892-Expand-LingeringPotion-API.patch')
-rw-r--r--patches/server/0892-Expand-LingeringPotion-API.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0892-Expand-LingeringPotion-API.patch b/patches/server/0892-Expand-LingeringPotion-API.patch
new file mode 100644
index 0000000000..3a58f0528a
--- /dev/null
+++ b/patches/server/0892-Expand-LingeringPotion-API.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tamion <[email protected]>
+Date: Sat, 4 Nov 2023 23:57:05 +0100
+Subject: [PATCH] Expand LingeringPotion API
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
+index e78eef3b6fbcd657f9dd180df4cb2eeb55d0814f..9d79b193fe2a737a20d1709548b2cd6c454ff27b 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
+@@ -276,7 +276,7 @@ public class ThrownPotion extends ThrowableItemProjectile {
+ boolean noEffects = potioncontents.hasEffects(); // Paper - Fix potions splash events
+ // CraftBukkit start
+ org.bukkit.event.entity.LingeringPotionSplashEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callLingeringPotionSplashEvent(this, position, entityareaeffectcloud);
+- if (!(event.isCancelled() || entityareaeffectcloud.isRemoved() || (noEffects && !entityareaeffectcloud.potionContents.hasEffects()))) { // Paper - don't spawn area effect cloud if the effects were empty and not changed during the event handling
++ if (!(event.isCancelled() || entityareaeffectcloud.isRemoved() || (!event.allowsEmptyCreation() && (noEffects && !entityareaeffectcloud.potionContents.hasEffects())))) { // Paper - don't spawn area effect cloud if the effects were empty and not changed during the event handling
+ this.level().addFreshEntity(entityareaeffectcloud);
+ } else {
+ entityareaeffectcloud.discard(null); // CraftBukkit - add Bukkit remove cause