Add notable cuboid events.

src/main/java/net/aufdemrand/denizen/npc/dNPCRegistry.java

@@ -118,16 +118,22 @@ public void onSpawn(NPCSpawnEvent event) {
         getDenizen(event.getNPC()).action("spawn", null);
     }
 
+
     // <--[action]
     // @Actions
     // despawn
-    //
     // @Triggers when the NPC is despawned.
+    // This can be because a command was issues, or a chunk has been unloaded.
     //
     // @Context
-    // None
-    //
+    // <npc> The NPC involved.
     // -->
+
+    /**
+     * Fires a world script event and then NPC action when the NPC despawns.
+     *
+     * @param event NPCDespawnEvent
+     */
     @EventHandler
     public void despawn(NPCDespawnEvent event) {
         // Do world script event 'On NPC Completes Navigation'
@@ -138,21 +144,20 @@ public void despawn(NPCDespawnEvent event) {
         getDenizen(event.getNPC()).action("despawn", null);
     }
 
+
     // <--[action]
     // @Actions
     // remove
-    //
     // @Triggers when the NPC is removed.
     //
     // @Context
-    // None
-    //
+    // <npc> The NPC involved.
     // -->
+
     /**
      * Removes an NPC from the Registry when removed from Citizens.
      *
      * @param event NPCRemoveEvent
-     *
      */
     @EventHandler
     public void onRemove(NPCRemoveEvent event) {

src/main/java/net/aufdemrand/denizen/objects/dCuboid.java

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -24,7 +25,14 @@ public class dCuboid implements dObject, Notable {
     //   STATIC METHODS
     /////////////////
 
+    public static List<dCuboid> getNotableCuboidsContaining(Location location) {
+        List<dCuboid> cuboids = new ArrayList<dCuboid>();
+        for (dObject notable : NotableManager.getAllType(dCuboid.class))
+            if (((dCuboid) notable).isInsideCuboid(location))
+                cuboids.add((dCuboid) notable);
 
+        return cuboids;
+    }
 
 
     //////////////////
@@ -321,8 +329,8 @@ public dList getSpawnableBlocks() {
                             .add(x, y, z));
 
                     if (SafeBlock.blockIsSafe(loc.getBlock().getType())
-                        && SafeBlock.blockIsSafe(loc.clone().add(0, 1, 0).getBlock().getType())
-                        && loc.clone().add(0, -1, 0).getBlock().getType().isSolid()) {
+                            && SafeBlock.blockIsSafe(loc.clone().add(0, 1, 0).getBlock().getType())
+                            && loc.clone().add(0, -1, 0).getBlock().getType().isSolid()) {
                         // Get the center of the block, so the entity won't suffocate
                         // inside the edges for a couple of seconds
                         loc.add(0.5, 0, 0.5);
@@ -351,11 +359,11 @@ public boolean isUnique() {
     @Override
     @Note("cuboid")
     public String getSaveObject() {
-        return loc_1.getBlockX() + "," + loc_1.getBlockY()
-                + "," + loc_1.getBlockZ() + "," + loc_1.getWorld().getName()
-                + "|"
-                + loc_2.getBlockX() + "," + loc_2.getBlockY()
-                + "," + loc_2.getBlockZ() + "," + loc_2.getWorld().getName();
+        return loc_1.getBlockX() + ',' + loc_1.getBlockY()
+                + ',' + loc_1.getBlockZ() + ',' + loc_1.getWorld().getName()
+                + '|'
+                + loc_2.getBlockX() + ',' + loc_2.getBlockY()
+                + ',' + loc_2.getBlockZ() + ',' + loc_2.getWorld().getName();
     }
 
     @Override
@@ -376,7 +384,7 @@ public void forget() {
     ////////////////////
 
 
-String prefix = "Cuboid";
+    String prefix = "Cuboid";
 
 
     @Override

src/main/java/net/aufdemrand/denizen/objects/notable/NotableManager.java

@@ -2,6 +2,7 @@
 
 import net.aufdemrand.denizen.objects.dObject;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
+import net.aufdemrand.denizen.utilities.debugging.dB;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
@@ -12,6 +13,7 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
@@ -60,7 +62,7 @@ public static Notable getSavedObject(String id) {
 
     public static String getSavedId(Notable object) {
         if (reverseObjects.containsKey(object))
-            return reverseObjects.get(reverseObjects);
+            return reverseObjects.get(object);
         return null;
     }
 
@@ -92,6 +94,17 @@ public static void remove(Notable obj) {
         typeTracker.remove(id.toLowerCase());
     }
 
+    public static List<dObject> getAllType(Class<? extends dObject> type) {
+        List<dObject> objects = new ArrayList<dObject>();
+        for (Map.Entry<String, Notable> notable : notableObjects.entrySet()) {
+            dB.log(notable.toString());
+            if (isType(notable.getKey(), type))
+                objects.add((dObject) notable.getValue());
+        }
+
+        return objects;
+    }
+
 
 
     /*