Allow Give and Take to have data values on items

DenizenScript · Sep 11, 2013 · e0f9a85 · e0f9a85 · mcmonkey4eva · Sep 12, 2013
1 parent 6e3244f
commit e0f9a85
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/item/GiveCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/item/GiveCommand.java
@@ -64,7 +64,7 @@ else if (!scriptEntry.hasObject("engrave")
             else if (!scriptEntry.hasObject("items")
                         && !scriptEntry.hasObject("type")
                         && arg.matchesArgumentType(dItem.class))
-                scriptEntry.addObject("items", dList.valueOf(arg.getValue()).filter(dItem.class));
+                scriptEntry.addObject("items", dList.valueOf(arg.raw_value.replace("item:", "")).filter(dItem.class));
 
             else if (!scriptEntry.hasObject("inventory")
                         && arg.matchesPrefix("t, to")

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/item/TakeCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/item/TakeCommand.java
@@ -59,7 +59,7 @@ else if (!scriptEntry.hasObject("qty")
             else if (!scriptEntry.hasObject("items")
                         && !scriptEntry.hasObject("type")
                         && arg.matchesArgumentList(dItem.class))
-                scriptEntry.addObject("items", dList.valueOf(arg.getValue()).filter(dItem.class));
+                scriptEntry.addObject("items", dList.valueOf(arg.raw_value.replace("item:", "")).filter(dItem.class));
 
             else if (!scriptEntry.hasObject("inventory")
                         && arg.matchesPrefix("f, from")