From 9f3b14f323f13bc83864257d97b60accf8d8cfae Mon Sep 17 00:00:00 2001 From: Acrobot Date: Sun, 20 May 2012 11:14:43 +0200 Subject: Use existing function to get opposite block face --- src/main/java/org/bukkit/util/BlockIterator.java | 31 +++--------------------- 1 file changed, 3 insertions(+), 28 deletions(-) (limited to 'src/main/java') 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 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 { 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); } -- cgit v1.2.3