From ed4d4cd651c4eff0012e31db0da124ec7adec324 Mon Sep 17 00:00:00 2001
From: Gerrygames <gecam59@gmail.com>
Date: Sat, 6 Feb 2021 09:23:50 +1100
Subject: [PATCH] SPIGOT-6342: TROPICAL_FISH_BUCKET isSimilar returns true when
 it should not

---
 .../craftbukkit/inventory/CraftMetaTropicalFishBucket.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java
index 134f40f30..448a25f00 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java
@@ -154,7 +154,7 @@ class CraftMetaTropicalFishBucket extends CraftMetaItem implements TropicalFishB
             CraftMetaTropicalFishBucket that = (CraftMetaTropicalFishBucket) meta;
 
             return (hasVariant() ? that.hasVariant() && this.variant.equals(that.variant) : !that.hasVariant())
-                    && entityTag != null ? that.entityTag != null && this.entityTag.equals(that.entityTag) : entityTag == null;
+                    && (entityTag != null ? that.entityTag != null && this.entityTag.equals(that.entityTag) : that.entityTag == null);
         }
         return true;
     }