Improve some inventory script matching

DenizenScript · Aug 10, 2015 · d1ec548 · d1ec548
1 parent 559ccaa
commit d1ec548
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
@@ -505,12 +505,9 @@ else if (getIdType().equals("enderchest")) {
             }
         }
         else if (getIdType().equals("script")) {
-            // Iterate through inventory scripts
-            for (InventoryScriptContainer container : InventoryScriptHelper.inventory_scripts.values()) {
-                if (((CraftInventory) (container.getInventoryFrom()).inventory).getInventory().equals(((CraftInventory) inventory).getInventory())) {
-                    idHolder = container.getName();
-                    return;
-                }
+            if (InventoryScriptHelper.tempInventoryScripts.containsKey(inventory)) {
+                idHolder = InventoryScriptHelper.tempInventoryScripts.get(inventory);
+                return;
             }
         }
         idType = "generic";

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
@@ -1859,7 +1859,7 @@ public void adjust(Mechanism mechanism) {
             }
         }
 
-        // <--[tag]
+        // <--[mechanism]
         // @object dPlayer
         // @name item_on_cursor
         // @input dItem

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
@@ -83,10 +83,6 @@ public InventoryType getInventoryType() {
         }
     }
 
-    public dInventory getInventoryFrom() {
-        return getInventoryFrom(null, null);
-    }
-
     public dInventory getInventoryFrom(dPlayer player, dNPC npc) {
 
         dInventory inventory = null;
@@ -156,11 +152,11 @@ public dInventory getInventoryFrom(dPlayer player, dNPC npc) {
                             }
                         }
                         else if (dItem.matches(item)) {
-                            finalItems[itemsAdded] = dItem.valueOf(TagManager.tag(item, context), player, npc).getItemStack();
+                            finalItems[itemsAdded] = dItem.valueOf(item, player, npc).getItemStack();
                         }
                         else {
                             finalItems[itemsAdded] = new ItemStack(Material.AIR);
-                            if (!item.trim().isEmpty()) {
+                            if (!item.isEmpty()) {
                                 dB.echoError("Inventory script \"" + getName() + "\" has an invalid slot item: ["
                                         + item + "]... Ignoring it and assuming \"AIR\"");
                             }