From ff0f66b62696a8bbbe991279daac79ea128c2109 Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Wed, 22 Jul 2015 02:12:02 -0700 Subject: [PATCH] Revert half the pom improvement stupid vault... --- pom.xml | 4 ++-- .../denizen/scripts/commands/item/GiveCommand.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 670e5ca145..fb66e06f35 100644 --- a/pom.xml +++ b/pom.xml @@ -79,8 +79,8 @@ net.milkbowl.vault - VaultAPI - 1.5 + Vault + 1.5.4 provided 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 index eb1160f53c..5c3251be05 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/item/GiveCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/item/GiveCommand.java @@ -53,9 +53,9 @@ else if (!scriptEntry.hasObject("unlimit_stack_size") scriptEntry.addObject("unlimit_stack_size", new Element(true)); else if (!scriptEntry.hasObject("items") - && !scriptEntry.hasObject("type") - && arg.matchesArgumentList(dItem.class)) { - scriptEntry.addObject("items", dList.valueOf(arg.raw_value.replace("item:", "")).filter(dItem.class, scriptEntry)); + && !scriptEntry.hasObject("type")) { + scriptEntry.addObject("items", dList.valueOf(arg.raw_value.startsWith("item:") ? + arg.raw_value.substring("item:".length()): arg.raw_value).filter(dItem.class, scriptEntry)); } else if (!scriptEntry.hasObject("inventory")