Skip to content

Commit 568eb72

Browse files
committed
temp disable shopItemId feature in release since we hadn't get it ready
1 parent 567a752 commit 568eb72

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

src/main/java/org/maxgamer/quickshop/util/matcher/item/BukkitItemMatcherImpl.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
package org.maxgamer.quickshop.util.matcher.item;
2121

22-
import de.tr7zw.nbtapi.NBTItem;
2322
import lombok.AllArgsConstructor;
2423
import org.bukkit.inventory.ItemStack;
2524
import org.bukkit.plugin.Plugin;
@@ -28,8 +27,6 @@
2827
import org.maxgamer.quickshop.QuickShop;
2928
import org.maxgamer.quickshop.api.shop.ItemMatcher;
3029

31-
import java.util.Objects;
32-
3330
/**
3431
* A simple impl for ItemMatcher
3532
*
@@ -81,13 +78,13 @@ public boolean matches(@Nullable ItemStack original, @Nullable ItemStack tester)
8178
tester = tester.clone();
8279
tester.setAmount(1);
8380

84-
if (plugin.getNbtapi() != null) {
85-
NBTItem nbtItemOriginal = new NBTItem(original);
86-
NBTItem nbtItemTester = new NBTItem(tester);
87-
if (Objects.equals(nbtItemOriginal.getString("shopId"), nbtItemTester.getString("shopId"))) {
88-
return true;
89-
}
90-
}
81+
// if (plugin.getNbtapi() != null) {
82+
// NBTItem nbtItemOriginal = new NBTItem(original);
83+
// NBTItem nbtItemTester = new NBTItem(tester);
84+
// if (Objects.equals(nbtItemOriginal.getString("shopId"), nbtItemTester.getString("shopId"))) {
85+
// return true;
86+
// }
87+
// }
9188
return tester.isSimilar(original);
9289
}
9390
}

src/main/java/org/maxgamer/quickshop/util/matcher/item/QuickShopItemMatcherImpl.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.maxgamer.quickshop.util.matcher.item;
2121

2222
import de.leonhard.storage.sections.FlatFileSection;
23-
import de.tr7zw.nbtapi.NBTItem;
2423
import lombok.AllArgsConstructor;
2524
import org.bukkit.attribute.Attribute;
2625
import org.bukkit.block.ShulkerBox;
@@ -145,13 +144,13 @@ public boolean matches(@Nullable ItemStack requireStack, @Nullable ItemStack giv
145144
givenStack = givenStack.clone();
146145
givenStack.setAmount(1);
147146

148-
if (plugin.getNbtapi() != null) {
149-
NBTItem nbtItemOriginal = new NBTItem(requireStack);
150-
NBTItem nbtItemTester = new NBTItem(givenStack);
151-
if (Objects.equals(nbtItemOriginal.getString("shopItemId"), nbtItemTester.getString("shopItemId"))) {
152-
return true;
153-
}
154-
}
147+
// if (plugin.getNbtapi() != null) {
148+
// NBTItem nbtItemOriginal = new NBTItem(requireStack);
149+
// NBTItem nbtItemTester = new NBTItem(givenStack);
150+
// if (Objects.equals(nbtItemOriginal.getString("shopItemId"), nbtItemTester.getString("shopItemId"))) {
151+
// return true;
152+
// }
153+
// }
155154

156155
if (workType == 1) {
157156
return requireStack.isSimilar(givenStack);

0 commit comments

Comments
 (0)