Fix leaky pipes (water flow). Fixes BUKKIT-3085

(Also, fix mistranslation for VehicleBlockCollisionEvent)
This commit is contained in:
feildmaster 2012-12-01 13:17:29 -06:00
parent c596093c31
commit 11894784b0
2 changed files with 3 additions and 3 deletions

View file

@ -134,7 +134,7 @@ public class BlockFlowing extends BlockFluids {
} }
// CraftBukkit start - all four cardinal directions. Do not change the order! // 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; int index = 0;
for (BlockFace currentFace : faces) { for (BlockFace currentFace : faces) {

View file

@ -638,9 +638,9 @@ public abstract class Entity {
} else if (d6 < d0) { } else if (d6 < d0) {
block = block.getRelative(BlockFace.WEST); block = block.getRelative(BlockFace.WEST);
} else if (d8 > d2) { } else if (d8 > d2) {
block = block.getRelative(BlockFace.NORTH);
} else if (d8 < d2) {
block = block.getRelative(BlockFace.SOUTH); block = block.getRelative(BlockFace.SOUTH);
} else if (d8 < d2) {
block = block.getRelative(BlockFace.NORTH);
} }
VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, block); VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, block);