Fix inventory.contains.display for books

DenizenScript · Jan 24, 2015 · 025493c · 025493c
1 parent 42246f8
commit 025493c
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
@@ -1155,15 +1155,26 @@ public String getAttribute(Attribute attribute) {
 
                 if (strict) {
                     for (ItemStack item : getContents()) {
-                        if (item != null && item.hasItemMeta() && item.getItemMeta().hasDisplayName() &&
+                        if (item != null && item.getType() == Material.WRITTEN_BOOK
+                                && ((BookMeta)item.getItemMeta()).getTitle().equalsIgnoreCase(search_string)) {
+                            found_items += item.getAmount();
+                            if (found_items >= qty) break;
+                        }
+                        else if (item != null && item.hasItemMeta() && item.getItemMeta().hasDisplayName() &&
                                 item.getItemMeta().getDisplayName().equalsIgnoreCase(search_string)) {
                             found_items += item.getAmount();
                             if (found_items >= qty) break;
                         }
                     }
                 } else {
                     for (ItemStack item : getContents()) {
-                        if (item != null && item.hasItemMeta() && item.getItemMeta().hasDisplayName() &&
+                        if (item != null && item.getType() == Material.WRITTEN_BOOK
+                                && ((BookMeta)item.getItemMeta()).getTitle()
+                                .toLowerCase().contains(search_string.toLowerCase())) {
+                            found_items += item.getAmount();
+                            if (found_items >= qty) break;
+                        }
+                        else if (item != null && item.hasItemMeta() && item.getItemMeta().hasDisplayName() &&
                                 item.getItemMeta().getDisplayName().toLowerCase()
                                         .contains(search_string.toLowerCase())) {
                             found_items += item.getAmount();