Altitude/PlayerShops
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve support for TropicalFishBucket

Browse Source
This commit is contained in:
Len 2026-07-30 08:15:40 -05:00
parent 23ab3747fd
commit a98b35d073
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/alttd/playershops/utils/ItemMatcher.java
View File

@ -228,13 +228,19 @@ public class ItemMatcher {
matcherList.add( matcherList.add(
(meta1, meta2) -> { (meta1, meta2) -> {
if (meta1 instanceof TropicalFishBucketMeta tropicalFishBucketMeta1 && meta2 instanceof TropicalFishBucketMeta tropicalFishBucketMeta2) { if (meta1 instanceof TropicalFishBucketMeta tropicalFishBucketMeta1 && meta2 instanceof TropicalFishBucketMeta tropicalFishBucketMeta2) {
if (tropicalFishBucketMeta1.hasVariant() != tropicalFishBucketMeta2.hasVariant()) { if (tropicalFishBucketMeta1.hasVariant() && tropicalFishBucketMeta2.hasVariant()) {
if (tropicalFishBucketMeta1.getPattern() != tropicalFishBucketMeta2.getPattern()) {
return false; return false;
} }
return !tropicalFishBucketMeta1.hasVariant() if (tropicalFishBucketMeta1.getBodyColor() != tropicalFishBucketMeta2.getBodyColor()) {
|| (tropicalFishBucketMeta1.getPattern() == tropicalFishBucketMeta2.getPattern() return false;
&& tropicalFishBucketMeta1.getBodyColor().equals(tropicalFishBucketMeta2.getBodyColor()) }
&& tropicalFishBucketMeta1.getPatternColor().equals(tropicalFishBucketMeta2.getPatternColor())); return tropicalFishBucketMeta1.getPatternColor() == tropicalFishBucketMeta2.getPatternColor();
}
// return !tropicalFishBucketMeta1.hasVariant()
// || (tropicalFishBucketMeta1.getPattern() == tropicalFishBucketMeta2.getPattern()
// && tropicalFishBucketMeta1.getBodyColor().equals(tropicalFishBucketMeta2.getBodyColor())
// && tropicalFishBucketMeta1.getPatternColor().equals(tropicalFishBucketMeta2.getPatternColor()));
} }
return true; return true;
} }