Add tag queue.definition[name]

A way to read defs off other queues
DenizenScript · Sep 25, 2014 · b11be3d · b11be3d
1 parent 6af33b1
commit b11be3d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/core/RedstoneSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/RedstoneSmartEvent.java
@@ -4,16 +4,12 @@
 import net.aufdemrand.denizen.events.SmartEvent;
 import net.aufdemrand.denizen.objects.Element;
 import net.aufdemrand.denizen.objects.dLocation;
-import net.aufdemrand.denizen.objects.dMaterial;
 import net.aufdemrand.denizen.objects.dObject;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import org.bukkit.Material;
-import org.bukkit.block.BlockFace;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockRedstoneEvent;
-import org.bukkit.event.entity.EntityChangeBlockEvent;
 
 import java.util.Arrays;
 import java.util.HashMap;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java b/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java
@@ -854,6 +854,18 @@ public String getAttribute(Attribute attribute) {
             return new dList(getAllDefinitions().keySet()).getAttribute(attribute.fulfill(1));
         }
 
+        // <--[tag]
+        // @attribute <q@queue.definition[<definition>]>
+        // @returns dList
+        // @description
+        // Returns the value of the specified definition.
+        // Returns null if the queue lacks the definition.
+        // -->
+        if (attribute.startsWith("definition")
+                && attribute.hasContext(1)) {
+            return new Element(getDefinition(attribute.getContext(1))).getAttribute(attribute.fulfill(1));
+        }
+
         // <--[tag]
         // @attribute <q@queue.npc>
         // @returns dNPC