improve material matcher

DenizenScript · Jun 25, 2018 · c97dc7a · c97dc7a
1 parent 68bd74d
commit c97dc7a
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/BukkitScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/BukkitScriptEvent.java
@@ -113,7 +113,13 @@ public boolean tryItem(dItem item, String comparedto) {
         }
         dMaterial quickOf = dMaterial.quickOfNamed(comparedto);
         if (quickOf != null) {
-            return item.getMaterial().equals(quickOf);
+            dMaterial mat = item.getMaterial();
+            if (quickOf.getMaterial() != mat.getMaterial()) {
+                return false;
+            }
+            if (quickOf.equals(mat)) {
+                return true;
+            }
         }
         item = new dItem(item.getItemStack().clone());
         item.setAmount(1);
@@ -143,7 +149,12 @@ public boolean tryMaterial(dMaterial mat, String comparedto) {
         }
         dMaterial quickOf = dMaterial.quickOfNamed(comparedto);
         if (quickOf != null) {
-            return mat.equals(quickOf);
+            if (quickOf.getMaterial() != mat.getMaterial()) {
+                return false;
+            }
+            if (quickOf.equals(mat)) {
+                return true;
+            }
         }
         else if (CoreUtilities.toLowerCase(mat.realName()).equals(comparedto)) {
             return true;