From 6dfe466ce456dc121d9ae586b4f146f09d589fb4 Mon Sep 17 00:00:00 2001 From: Morphan1 Date: Sun, 4 Jan 2015 11:44:51 -0500 Subject: [PATCH] Allow correct dItem player/npc tag parsing in inventory scripts --- .../scripts/containers/core/InventoryScriptContainer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InventoryScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InventoryScriptContainer.java index 7c1eb4a5b5..f96078ccb1 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InventoryScriptContainer.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InventoryScriptContainer.java @@ -153,13 +153,13 @@ public dInventory getInventoryFrom(dPlayer player, dNPC npc) { dItem.matches(getString("DEFINITIONS." + m.group(2)))) { finalItems[itemsAdded] = dItem.valueOf(TagManager.tag (getString("DEFINITIONS." + m.group(2)), - new BukkitTagContext(player, npc, false, null, shouldDebug(), new dScript(this)))) - .getItemStack(); + new BukkitTagContext(player, npc, false, null, shouldDebug(), new dScript(this))), + player, npc).getItemStack(); } else if (dItem.matches(m.group(2))) { finalItems[itemsAdded] = dItem.valueOf(TagManager.tag(m.group(2), - new BukkitTagContext(player, npc, false, null, shouldDebug(), new dScript(this)))) - .getItemStack(); + new BukkitTagContext(player, npc, false, null, shouldDebug(), new dScript(this))), + player, npc).getItemStack(); } else { finalItems[itemsAdded] = new ItemStack(Material.AIR);