diff options
| author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-01-04 16:17:05 +0000 |
|---|---|---|
| committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-01-04 16:17:05 +0000 |
| commit | ca765c351298073e7084f7b2f47cadda1fce01d4 (patch) | |
| tree | f0e097911780b476c24b5e5abec3b2c32dcd4524 /src/main/java/net/minecraft/server | |
| parent | 1ed14de10ea452448c9e517415745cc434fc2b1f (diff) | |
| download | craftbukkit-ca765c351298073e7084f7b2f47cadda1fce01d4.tar craftbukkit-ca765c351298073e7084f7b2f47cadda1fce01d4.tar.gz craftbukkit-ca765c351298073e7084f7b2f47cadda1fce01d4.tar.lz craftbukkit-ca765c351298073e7084f7b2f47cadda1fce01d4.tar.xz craftbukkit-ca765c351298073e7084f7b2f47cadda1fce01d4.zip | |
Fixed building in water
Diffstat (limited to 'src/main/java/net/minecraft/server')
| -rw-r--r-- | src/main/java/net/minecraft/server/WorldServer.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java index 133fd28e..8936121f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -101,17 +101,13 @@ public class WorldServer extends World { if (axisalignedbb != null && !a(axisalignedbb)) { return false; } - - // Craftbukkit - check this first as we dont want to allow the user to override this either - // Notch checks it after the check to see if block is water, lava, fire, portal - if (!(i1 > 0 && block == null)) return false; boolean defaultReturn; if (block == Block.A || block == Block.B || block == Block.C || block == Block.D || block == Block.ar || block == Block.aS) { defaultReturn = true; } else { - defaultReturn = block1.a(this, j1, k1, l1); + defaultReturn = (i1 > 0) && (block == null) && (block1.a(this, j1, k1, l1)); } // Craftbukkit - If flag is true, it's natural, not user placement. Don't hook. |