Add ID tags to dInventory.

DenizenScript · Oct 21, 2013 · dd12715 · dd12715
1 parent 7572f06
commit dd12715
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
@@ -695,16 +695,36 @@ public String getAttribute(Attribute attribute) {
             }
         }
 
+        // <--[tag]
+        // @attribute <in@inventory.id_holder>
+        // @returns Element
+        // @description
+        // Returns Denizen's holder ID for this inventory
+        // -->
+        if (attribute.startsWith("id_holder")) {
+            return new Element(idHolder).getAttribute(attribute.fulfill(1));
+        }
+
+        // <--[tag]
+        // @attribute <in@inventory.id_type>
+        // @returns Element
+        // @description
+        // Returns Denizen's type ID for this inventory
+        // -->
+        if (attribute.startsWith("id_type")) {
+            return new Element(idType).getAttribute(attribute.fulfill(1));
+        }
+
         // <--[tag]
         // @attribute <in@inventory.location>
         // @returns dLocation
         // @description
         // Returns the location of this inventory's holder.
         // -->
         if (attribute.startsWith("location")) {
-
-            return new dLocation(getLocation())
-                    .getAttribute(attribute.fulfill(1));
+            if (getLocation() != null)
+                return getLocation().getAttribute(attribute.fulfill(1));
+            else return "null";
         }
 
         // <--[tag]