From 527041ab59d7d5d9ee49550c28f5c73cbe5c3bf0 Mon Sep 17 00:00:00 2001
From: James Perry <beanp02@yahoo.com>
Date: Fri, 27 Sep 2024 08:35:25 +1000
Subject: [PATCH] SPIGOT-7902, #1477: Fix CraftMetaPotion#hasCustomEffects()
 does not check if customEffects (List) is empty

---
 .../org/bukkit/craftbukkit/inventory/CraftMetaPotion.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
index 8bdc853c2..c40905f4b 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
+++ b/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<Holder<PotionRegistry>> defaultPotion = (hasBasePotionType()) ? Optional.of(CraftPotionType.bukkitToMinecraftHolder(type)) : Optional.empty();
         Optional<Integer> 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