From 28b52727427eb06f3da5a5cef6e67715215fcb38 Mon Sep 17 00:00:00 2001 From: Len <40720638+destro174@users.noreply.github.com> Date: Sun, 3 Dec 2023 21:06:50 +0100 Subject: [PATCH] Add more items to item matcher --- .../java/com/alttd/playershops/utils/ShopUtil.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/com/alttd/playershops/utils/ShopUtil.java b/src/main/java/com/alttd/playershops/utils/ShopUtil.java index 015cfad..94c3e14 100644 --- a/src/main/java/com/alttd/playershops/utils/ShopUtil.java +++ b/src/main/java/com/alttd/playershops/utils/ShopUtil.java @@ -12,6 +12,7 @@ import org.bukkit.*; import org.bukkit.block.BlockState; import org.bukkit.block.ShulkerBox; import org.bukkit.enchantments.Enchantment; +import org.bukkit.entity.Axolotl; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; @@ -82,6 +83,18 @@ public class ShopUtil { if (mapView1.getId() != mapView2.getId()) return false; // ID does not match } + if (itemMeta1 instanceof TropicalFishBucketMeta tropicalFishBucketMeta1 && itemMeta2 instanceof TropicalFishBucketMeta tropicalFishBucketMeta2) { + if (tropicalFishBucketMeta1.getBodyColor() != tropicalFishBucketMeta2.getBodyColor()) + return false; + if (tropicalFishBucketMeta1.getPattern() != tropicalFishBucketMeta2.getPattern()) + return false; + if (tropicalFishBucketMeta1.getPatternColor() != tropicalFishBucketMeta2.getPatternColor()) + return false; + } + if (itemMeta1 instanceof AxolotlBucketMeta axolotlBucketMeta1 && itemMeta2 instanceof AxolotlBucketMeta axolotlBucketMeta2) { + if (axolotlBucketMeta1.getVariant() != axolotlBucketMeta2.getVariant()) + return false; + } if (itemMeta1 instanceof BlockStateMeta blockStateMeta1 && itemMeta2 instanceof BlockStateMeta blockStateMeta2) { // extra heavy - Banners, Shulkerboxes, beehive and more? BlockState blockState1 = blockStateMeta1.getBlockState();