diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java index 8bdc853c20..c40905f4b9 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java @@ -115,6 +115,10 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta { void applyToItem(CraftMetaItem.Applicator tag) { super.applyToItem(tag); + if (isPotionEmpty()) { + return; + } + Optional> defaultPotion = (hasBasePotionType()) ? Optional.of(CraftPotionType.bukkitToMinecraftHolder(type)) : Optional.empty(); Optional potionColor = (hasColor()) ? Optional.of(this.color.asRGB()) : Optional.empty(); @@ -174,7 +178,7 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta { @Override public boolean hasCustomEffects() { - return customEffects != null; + return customEffects != null && !customEffects.isEmpty(); } @Override