From a98b35d073071e4e65ef716289860131cfdc062e Mon Sep 17 00:00:00 2001
From: Len <40720638+destro174@users.noreply.github.com>
Date: Thu, 30 Jul 2026 08:15:40 -0500
Subject: [PATCH] Improve support for TropicalFishBucket

---
 .../alttd/playershops/utils/ItemMatcher.java   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/alttd/playershops/utils/ItemMatcher.java b/src/main/java/com/alttd/playershops/utils/ItemMatcher.java
index dafdb3a..4d34d90 100644
--- a/src/main/java/com/alttd/playershops/utils/ItemMatcher.java
+++ b/src/main/java/com/alttd/playershops/utils/ItemMatcher.java
@@ -228,13 +228,19 @@ public class ItemMatcher {
         matcherList.add(
                 (meta1, meta2) -> {
                     if (meta1 instanceof TropicalFishBucketMeta tropicalFishBucketMeta1 && meta2 instanceof TropicalFishBucketMeta tropicalFishBucketMeta2) {
-                        if (tropicalFishBucketMeta1.hasVariant() != tropicalFishBucketMeta2.hasVariant()) {
-                            return false;
+                        if (tropicalFishBucketMeta1.hasVariant() && tropicalFishBucketMeta2.hasVariant()) {
+                            if (tropicalFishBucketMeta1.getPattern() != tropicalFishBucketMeta2.getPattern()) {
+                                return false;
+                            }
+                            if (tropicalFishBucketMeta1.getBodyColor() != tropicalFishBucketMeta2.getBodyColor()) {
+                                return false;
+                            }
+                            return tropicalFishBucketMeta1.getPatternColor() == tropicalFishBucketMeta2.getPatternColor();
                         }
-                        return !tropicalFishBucketMeta1.hasVariant()
-                                || (tropicalFishBucketMeta1.getPattern() == tropicalFishBucketMeta2.getPattern()
-                                && tropicalFishBucketMeta1.getBodyColor().equals(tropicalFishBucketMeta2.getBodyColor())
-                                && tropicalFishBucketMeta1.getPatternColor().equals(tropicalFishBucketMeta2.getPatternColor()));
+//                        return !tropicalFishBucketMeta1.hasVariant()
+//                                || (tropicalFishBucketMeta1.getPattern() == tropicalFishBucketMeta2.getPattern()
+//                                && tropicalFishBucketMeta1.getBodyColor().equals(tropicalFishBucketMeta2.getBodyColor())
+//                                && tropicalFishBucketMeta1.getPatternColor().equals(tropicalFishBucketMeta2.getPatternColor()));
                     }
                     return true;
                 }