summaryrefslogtreecommitdiffstats
path: root/src/main/java/net
diff options
context:
space:
mode:
authorsk89q <the.sk89q@gmail.com>2011-01-15 21:11:26 -0800
committersk89q <the.sk89q@gmail.com>2011-01-15 21:11:26 -0800
commit807de6ee22f665196adc48498a27223317973958 (patch)
tree17fba735e29f2ddb312b92baab94452f1c7de2f8 /src/main/java/net
parent9e65c243e400eabb5d0c1024487b1a3000574e65 (diff)
downloadcraftbukkit-807de6ee22f665196adc48498a27223317973958.tar
craftbukkit-807de6ee22f665196adc48498a27223317973958.tar.gz
craftbukkit-807de6ee22f665196adc48498a27223317973958.tar.lz
craftbukkit-807de6ee22f665196adc48498a27223317973958.tar.xz
craftbukkit-807de6ee22f665196adc48498a27223317973958.zip
Moved the source block definition higher in BlockFlowing to ensure its accuracy.
Diffstat (limited to 'src/main/java/net')
-rw-r--r--src/main/java/net/minecraft/server/BlockFlowing.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
index 19ae2690..81a4c792 100644
--- a/src/main/java/net/minecraft/server/BlockFlowing.java
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java
@@ -31,6 +31,11 @@ public class BlockFlowing extends BlockFluids {
}
public void a(World world, int i1, int j1, int k1, Random random) {
+ // CraftBukkit start
+ // skedit: Moved up to make sure that it is accurate
+ CraftBlock source = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i1, j1, k1);
+ // CraftBukkit end
+
int l1 = g(world, i1, j1, k1);
byte byte0 = 1;
@@ -87,10 +92,9 @@ public class BlockFlowing extends BlockFluids {
} else {
i(world, i1, j1, k1);
}
-
- // CraftBukkit start
- CraftBlock source = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i1, j1, k1);
+
if (l(world, i1, j1 - 1, k1)) {
+ // CraftBukkit start
// Craftbucket send "down" to the server
BlockFromToEvent blockFlow = new BlockFromToEvent(Type.BLOCK_FLOW, source, BlockFace.DOWN);
((WorldServer) world).getServer().getPluginManager().callEvent(blockFlow);