allow a list of materials in contains.material

DenizenScript · May 6, 2020 · 93c85cf · 93c85cf
1 parent 2bce698
commit 93c85cf
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java
@@ -1889,20 +1889,20 @@ else if (item != null && item.hasItemMeta() && item.getItemMeta().hasDisplayName
                 return new ElementTag(found_items >= qty);
             }
             // <--[tag]
-            // @attribute <InventoryTag.contains.material[<material>]>
+            // @attribute <InventoryTag.contains.material[<material>|...]>
             // @returns ElementTag(Boolean)
             // @description
             // Returns whether the inventory contains an item with the specified material (except item script items).
             // -->
             if (attribute.startsWith("material", 2)) {
-                if (!attribute.hasContext(2) || !MaterialTag.matches(attribute.getContext(2))) {
+                if (!attribute.hasContext(2)) {
                     return null;
                 }
-                MaterialTag material = MaterialTag.valueOf(attribute.getContext(2));
+                List<MaterialTag> materials = ListTag.valueOf(attribute.getContext(2), attribute.context).filter(MaterialTag.class, attribute.context);
                 int qty = 1;
 
                 // <--[tag]
-                // @attribute <InventoryTag.contains.material[<material>].quantity[<#>]>
+                // @attribute <InventoryTag.contains.material[<material>|...].quantity[<#>]>
                 // @returns ElementTag(Boolean)
                 // @description
                 // Returns whether the inventory contains a certain quantity of an item with the specified material (except item script items).
@@ -1917,11 +1917,17 @@ else if (item != null && item.hasItemMeta() && item.getItemMeta().hasDisplayName
 
                 int found_items = 0;
 
+                mainLoop:
                 for (ItemStack item : object.getContents()) {
-                    if (item != null && item.getType() == material.getMaterial() && !(new ItemTag(item).isItemscript())) {
-                        found_items += item.getAmount();
-                        if (found_items >= qty) {
-                            break;
+                    if (item == null) {
+                        continue;
+                    }
+                    for (MaterialTag material : materials) {
+                        if (item.getType() == material.getMaterial() && !(new ItemTag(item).isItemscript())) {
+                            found_items += item.getAmount();
+                            if (found_items >= qty) {
+                                break mainLoop;
+                            }
                         }
                     }
                 }