summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAcrobot <andrzejp@dysleksja.pl>2012-05-20 11:14:43 +0200
committerfeildmaster <admin@feildmaster.com>2012-05-25 05:01:47 -0500
commit9f3b14f323f13bc83864257d97b60accf8d8cfae (patch)
tree8635534845c76e7ad69b19acb317a92b63f9b8b6
parenteb8f92c83a34477fc119ed2691e0637b867c70c4 (diff)
downloadbukkit-9f3b14f323f13bc83864257d97b60accf8d8cfae.tar
bukkit-9f3b14f323f13bc83864257d97b60accf8d8cfae.tar.gz
bukkit-9f3b14f323f13bc83864257d97b60accf8d8cfae.tar.lz
bukkit-9f3b14f323f13bc83864257d97b60accf8d8cfae.tar.xz
bukkit-9f3b14f323f13bc83864257d97b60accf8d8cfae.zip
Use existing function to get opposite block face
-rw-r--r--src/main/java/org/bukkit/util/BlockIterator.java31
1 files changed, 3 insertions, 28 deletions
diff --git a/src/main/java/org/bukkit/util/BlockIterator.java b/src/main/java/org/bukkit/util/BlockIterator.java
index 67836098..672cc0f1 100644
--- a/src/main/java/org/bukkit/util/BlockIterator.java
+++ b/src/main/java/org/bukkit/util/BlockIterator.java
@@ -134,16 +134,16 @@ public class BlockIterator implements Iterator<Block> {
Block lastBlock;
- lastBlock = startBlock.getRelative(reverseFace(mainFace));
+ lastBlock = startBlock.getRelative(mainFace.getOppositeFace());
if (secondError < 0) {
secondError += gridSize;
- lastBlock = lastBlock.getRelative(reverseFace(secondFace));
+ lastBlock = lastBlock.getRelative(secondFace.getOppositeFace());
}
if (thirdError < 0) {
thirdError += gridSize;
- lastBlock = lastBlock.getRelative(reverseFace(thirdFace));
+ lastBlock = lastBlock.getRelative(thirdFace.getOppositeFace());
}
// This means that when the variables are positive, it means that the coord=1 boundary has been crossed
@@ -178,31 +178,6 @@ public class BlockIterator implements Iterator<Block> {
return a.getX() == b.getX() && a.getY() == b.getY() && a.getZ() == b.getZ();
}
- private BlockFace reverseFace(BlockFace face) {
- switch (face) {
- case UP:
- return BlockFace.DOWN;
-
- case DOWN:
- return BlockFace.UP;
-
- case NORTH:
- return BlockFace.SOUTH;
-
- case SOUTH:
- return BlockFace.NORTH;
-
- case EAST:
- return BlockFace.WEST;
-
- case WEST:
- return BlockFace.EAST;
-
- default:
- return null;
- }
- }
-
private BlockFace getXFace(Vector direction) {
return ((direction.getX() > 0) ? BlockFace.SOUTH : BlockFace.NORTH);
}