Various minor patches

DenizenScript · Apr 8, 2015 · b3cb7a9 · b3cb7a9
1 parent 9347140
commit b3cb7a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java b/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java
@@ -432,7 +432,10 @@ public List<dLocation> getBlocks_internal(List<dMaterial> materials) {
                 for (int y = 0; y != y_distance + 1; y++) {
                     for (int z = 0; z != z_distance + 1; z++) {
                         loc = new dLocation(loc_1.clone().add(x, y, z));
-                        if (!filter.isEmpty() && loc.getY() >= 0 && loc.getY() < 256) {
+                        if (loc.getY() < 0 || loc.getY() > 255) {
+                            continue; // TODO: Why is this ever possible?
+                        }
+                        if (!filter.isEmpty()) { // TODO: Should 'filter' exist?
                             // Check filter
                             for (dObject material : filter) {
                                 if (((dMaterial)material).matchesMaterialData(
@@ -730,7 +733,7 @@ public String getAttribute(Attribute attribute) {
         if (attribute == null) return null;
 
         // <--[tag]
-        // @attribute <cu@cuboid.get_blocks[<material>...]>
+        // @attribute <cu@cuboid.get_blocks[<material>|...]>
         // @returns dList(dLocation)
         // @description
         // Returns each block location within the dCuboid.

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityChestCarrier.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityChestCarrier.java
@@ -62,7 +62,7 @@ public String getAttribute(Attribute attribute) {
         // @mechanism dEntity.carries_chest
         // @group properties
         // @description
-        // If the entity is an horse, returns whether it is carrying a chest.
+        // If the entity is a horse, returns whether it is carrying a chest.
         // -->
         if (attribute.startsWith("carries_chest"))
             return new Element(((Horse)entity.getBukkitEntity()).isCarryingChest())