bug fix

Author: Ghost-chu

pom.xml

@@ -25,7 +25,7 @@
     <artifactId>QuickShop</artifactId>
 
     <properties>
-        <pluginver>5.0.0.12</pluginver>
+        <pluginver>5.0.0.13</pluginver>
         <package>org.maxgamer.quickshop</package>
         <developer>Ghost-chu</developer>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -21,15 +21,14 @@
 
 import de.tr7zw.nbtapi.NBTItem;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.shop.ItemMatcher;
 
-import java.util.Objects;
-
 /**
  * A simple impl for ItemMatcher
  *
@@ -84,8 +83,14 @@ public boolean matches(@Nullable ItemStack original, @Nullable ItemStack tester)
         if (plugin.getNbtapi() != null) {
             NBTItem nbtItemOriginal = new NBTItem(original);
             NBTItem nbtItemTester = new NBTItem(tester);
-            if (Objects.equals(nbtItemOriginal.getString("shopItemId"), nbtItemTester.getString("shopItemId"))) {
-                return true;
+            String tagOriginal = nbtItemOriginal.getString("shopItemId");
+            String tagTester = nbtItemTester.getString("shopItemId");
+            if (StringUtils.isNotEmpty(tagOriginal)) {
+                if (StringUtils.isNotEmpty(tagTester)) {
+                    if (tagOriginal.equals(tagTester)) {
+                        return true;
+                    }
+                }
             }
         }
         return tester.isSimilar(original);

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

@@ -22,6 +22,7 @@
 import de.leonhard.storage.sections.FlatFileSection;
 import de.tr7zw.nbtapi.NBTItem;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.block.ShulkerBox;
 import org.bukkit.enchantments.Enchantment;
@@ -144,15 +145,19 @@ public boolean matches(@Nullable ItemStack requireStack, @Nullable ItemStack giv
         requireStack.setAmount(1);
         givenStack = givenStack.clone();
         givenStack.setAmount(1);
-
         if (plugin.getNbtapi() != null) {
             NBTItem nbtItemOriginal = new NBTItem(requireStack);
             NBTItem nbtItemTester = new NBTItem(givenStack);
-            if (Objects.equals(nbtItemOriginal.getString("shopItemId"), nbtItemTester.getString("shopItemId"))) {
-                return true;
+            String tagOriginal = nbtItemOriginal.getString("shopItemId");
+            String tagTester = nbtItemTester.getString("shopItemId");
+            if (StringUtils.isNotEmpty(tagOriginal)) {
+                if (StringUtils.isNotEmpty(tagTester)) {
+                    if (tagOriginal.equals(tagTester)) {
+                        return true;
+                    }
+                }
             }
         }
-
         if (workType == 1) {
             return requireStack.isSimilar(givenStack);
         }