summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-12-01 13:17:29 -0600
committerfeildmaster <admin@feildmaster.com>2012-12-01 13:33:44 -0600
commit11894784b06fa8559864932f46582e24c96bf45c (patch)
tree5d66832a76cf76e1af3c62f413c7865e9a7334ca /src/main/java/net/minecraft
parentc596093c310c04f2522015ea1cb31ff90c83c95a (diff)
downloadcraftbukkit-11894784b06fa8559864932f46582e24c96bf45c.tar
craftbukkit-11894784b06fa8559864932f46582e24c96bf45c.tar.gz
craftbukkit-11894784b06fa8559864932f46582e24c96bf45c.tar.lz
craftbukkit-11894784b06fa8559864932f46582e24c96bf45c.tar.xz
craftbukkit-11894784b06fa8559864932f46582e24c96bf45c.zip
Fix leaky pipes (water flow). Fixes BUKKIT-3085
(Also, fix mistranslation for VehicleBlockCollisionEvent)
Diffstat (limited to 'src/main/java/net/minecraft')
-rw-r--r--src/main/java/net/minecraft/server/BlockFlowing.java2
-rw-r--r--src/main/java/net/minecraft/server/Entity.java4
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 1aacf9f9..643422a3 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 f14a8335..9471fcf1 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);