Add half of functionality required for #476

DenizenScript · Oct 19, 2013 · cffbdab · cffbdab
1 parent bf80141
commit cffbdab
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
@@ -19,6 +19,7 @@
 import org.bukkit.inventory.meta.BookMeta;
 
 import net.aufdemrand.denizen.objects.aH.Argument;
+import net.aufdemrand.denizen.objects.aH.PrimitiveType;
 import net.aufdemrand.denizen.objects.notable.Notable;
 import net.aufdemrand.denizen.objects.notable.NotableManager;
 import net.aufdemrand.denizen.objects.notable.Note;
@@ -94,9 +95,13 @@ public static dInventory valueOf(String string, dPlayer player, dNPC npc) {
             String holder = m.group(3);
 
             if (type.equalsIgnoreCase("generic")) {
-                if (Argument.valueOf(holder).matchesEnum(InventoryType.values())) {
+                Argument arg = Argument.valueOf(holder);
+                if (arg.matchesEnum(InventoryType.values())) {
                     return new dInventory(InventoryType.valueOf(holder.toUpperCase()));
                 }
+                else if (arg.matchesPrimitive(PrimitiveType.Integer)) {
+                    return new dInventory(arg.asElement().asInt());
+                }
                 else {
                     dB.echoError("That type of inventory does not exist!");
                 }