Add feature requested in #477

DenizenScript · Oct 19, 2013 · fc36813 · fc36813
1 parent 88f17fc
commit fc36813
Showing 1 changed file with 2 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
@@ -35,7 +35,7 @@ public class dInventory implements dObject, Notable {
     //   PATTERNS
     /////////////////
 
-    final static Pattern inventory_by_type = Pattern.compile("(in@)(npc|player|entity|location|equipment)\\[(.+?)\\]", Pattern.CASE_INSENSITIVE);
+    final static Pattern inventory_by_type = Pattern.compile("(in@)(npc|player|entity|location|equipment|generic)\\[(.+?)\\]", Pattern.CASE_INSENSITIVE);
     final static Pattern inventory_by_script = Pattern.compile("(in@)(.+)", Pattern.CASE_INSENSITIVE);
 
     /////////////////////
@@ -97,7 +97,7 @@ public static dInventory valueOf(String string, dPlayer player, dNPC npc) {
 
             if (type.equalsIgnoreCase("generic")) {
                 if (Argument.valueOf(holder).matchesEnum(InventoryType.values())) {
-                    return new dInventory(InventoryType.valueOf(holder));
+                    return new dInventory(InventoryType.valueOf(holder.toUpperCase()));
                 }
                 else {
                     dB.echoError("That type of inventory does not exist!");