Check for null.

DenizenScript · Oct 6, 2013 · 5edc8ae · 5edc8ae
1 parent 3b74cd1
commit 5edc8ae
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
@@ -727,21 +727,21 @@ public String getAttribute(Attribute attribute) {
                         attribute.hasContext(3) &&
                         aH.matchesInteger(attribute.getContext(3))) {
 
-                    qty = attribute.getIntContext(2);
+                    qty = attribute.getIntContext(3);
                     attribs = 3;
                 }
 
                 int found_items = 0;
 
                 if (strict) {
                     for (ItemStack item : getContents()) {
-                        if (item.hasItemMeta() && item.getItemMeta().hasDisplayName() &&
+                        if (item != null && item.hasItemMeta() && item.getItemMeta().hasDisplayName() &&
                                 item.getItemMeta().getDisplayName().equalsIgnoreCase(search_string))
                             found_items++;
                     }
                 } else {
                     for (ItemStack item : getContents()) {
-                        if (item.hasItemMeta() && item.getItemMeta().hasDisplayName() &&
+                        if (item != null && item.hasItemMeta() && item.getItemMeta().hasDisplayName() &&
                                 item.getItemMeta().getDisplayName().toLowerCase()
                                         .contains(search_string.toLowerCase()))
                             found_items++;