improve inventory holder tag

DenizenScript · Jun 7, 2018 · b56f2ec · b56f2ec
1 parent de55258
commit b56f2ec
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...in/src/main/java/net/aufdemrand/denizen/objects/properties/inventory/InventoryHolder.java b/...in/src/main/java/net/aufdemrand/denizen/objects/properties/inventory/InventoryHolder.java
@@ -5,6 +5,7 @@
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.Mechanism;
 import net.aufdemrand.denizencore.objects.dObject;
+import net.aufdemrand.denizencore.objects.dScript;
 import net.aufdemrand.denizencore.objects.properties.Property;
 import net.aufdemrand.denizencore.tags.Attribute;
 import net.citizensnpcs.api.CitizensAPI;
@@ -50,6 +51,10 @@ public dObject getHolder() {
                 && (inventory.getIdType().equals("player") || inventory.getIdType().equals("enderchest"))) {
             return dPlayer.valueOf(inventory.getIdHolder());
         }
+        else if (inventory.getIdType() != null && inventory.getIdType().equalsIgnoreCase("script")
+                && dScript.matches(inventory.getIdHolder())) {
+            return dScript.valueOf(inventory.getIdHolder());
+        }
         org.bukkit.inventory.InventoryHolder holder = inventory.getInventory().getHolder();
 
         if (holder != null) {