From 11894784b06fa8559864932f46582e24c96bf45c Mon Sep 17 00:00:00 2001 From: feildmaster Date: Sat, 1 Dec 2012 13:17:29 -0600 Subject: [PATCH] Fix leaky pipes (water flow). Fixes BUKKIT-3085 (Also, fix mistranslation for VehicleBlockCollisionEvent) --- src/main/java/net/minecraft/server/BlockFlowing.java | 2 +- src/main/java/net/minecraft/server/Entity.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java index 1aacf9f900..643422a3c4 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.WEST, BlockFace.EAST, BlockFace.SOUTH, BlockFace.NORTH }; + BlockFace[] faces = new BlockFace[] { BlockFace.WEST, BlockFace.EAST, BlockFace.NORTH, BlockFace.SOUTH }; 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 f14a833534..9471fcf17e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -638,9 +638,9 @@ public abstract class Entity { } else if (d6 < d0) { block = block.getRelative(BlockFace.WEST); } else if (d8 > d2) { - block = block.getRelative(BlockFace.NORTH); - } else if (d8 < d2) { block = block.getRelative(BlockFace.SOUTH); + } else if (d8 < d2) { + block = block.getRelative(BlockFace.NORTH); } VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, block);