diff options
| author | feildmaster <admin@feildmaster.com> | 2012-12-01 00:22:01 -0600 |
|---|---|---|
| committer | feildmaster <admin@feildmaster.com> | 2012-12-01 01:14:25 -0600 |
| commit | c596093c310c04f2522015ea1cb31ff90c83c95a (patch) | |
| tree | ba67bbeb7fae4dc8611ebe775ec94191c179f5d8 /src/main/java/net/minecraft/server | |
| parent | 3404318bc54f9e1c502107cb60036a733e224971 (diff) | |
| download | craftbukkit-c596093c310c04f2522015ea1cb31ff90c83c95a.tar craftbukkit-c596093c310c04f2522015ea1cb31ff90c83c95a.tar.gz craftbukkit-c596093c310c04f2522015ea1cb31ff90c83c95a.tar.lz craftbukkit-c596093c310c04f2522015ea1cb31ff90c83c95a.tar.xz craftbukkit-c596093c310c04f2522015ea1cb31ff90c83c95a.zip | |
[BREAKING] Update BlockFace directions. Fixes BUKKIT-1567, BUKKIT-3069
The answer is 42
Diffstat (limited to 'src/main/java/net/minecraft/server')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockFlowing.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/Entity.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java index 7a2cea99..1aacf9f9 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -134,7 +134,7 @@ public class BlockFlowing extends BlockFluids { } // CraftBukkit start - all four cardinal directions. Do not change the order! - BlockFace[] faces = new BlockFace[] { BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST }; + BlockFace[] faces = new BlockFace[] { BlockFace.WEST, BlockFace.EAST, BlockFace.SOUTH, BlockFace.NORTH }; int index = 0; for (BlockFace currentFace : faces) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 50d4834c..f14a8335 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -634,13 +634,13 @@ public abstract class Entity { org.bukkit.block.Block block = this.world.getWorld().getBlockAt(MathHelper.floor(this.locX), MathHelper.floor(this.locY - (double) this.height), MathHelper.floor(this.locZ)); if (d6 > d0) { - block = block.getRelative(BlockFace.SOUTH); + block = block.getRelative(BlockFace.EAST); } else if (d6 < d0) { - block = block.getRelative(BlockFace.NORTH); - } else if (d8 > d2) { block = block.getRelative(BlockFace.WEST); + } else if (d8 > d2) { + block = block.getRelative(BlockFace.NORTH); } else if (d8 < d2) { - block = block.getRelative(BlockFace.EAST); + block = block.getRelative(BlockFace.SOUTH); } VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, block); |