mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-01 16:29:45 +01:00
20 lines
1.7 KiB
Diff
20 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tamion <70228790+notTamion@users.noreply.github.com>
|
||
|
|
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 2f80d484ad523860322483cebe92cf7cd8cfad22..b34dbb083ecc3a6ead7721391a79e7061e098498 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
|
||
|
|
@@ -288,7 +288,7 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
|
||
|
|
|
||
|
|
// CraftBukkit start
|
||
|
|
org.bukkit.event.entity.LingeringPotionSplashEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callLingeringPotionSplashEvent(this, position, entityareaeffectcloud);
|
||
|
|
- if (!(event.isCancelled() || entityareaeffectcloud.isRemoved() || (noEffects && entityareaeffectcloud.effects.isEmpty() && entityareaeffectcloud.getPotion().getEffects().isEmpty()))) { // 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.effects.isEmpty() && entityareaeffectcloud.getPotion().getEffects().isEmpty())))) { // 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();
|