diff options
author | feildmaster <admin@feildmaster.com> | 2012-07-29 02:33:13 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2012-08-02 04:58:50 -0500 |
commit | a43d621c0138110d2ec362b2eaa8f938f241bb49 (patch) | |
tree | d2ebc0d7a4a969d3257b1b958236428a24117eb1 /src/main/java/net/minecraft/server/BlockSand.java | |
parent | 08e2923bd4282579ca0cf7af0e6207cba0591e5c (diff) | |
download | craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar.gz craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar.lz craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar.xz craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.zip |
Update CraftBukkit to Minecraft 1.3.1
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockSand.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockSand.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/main/java/net/minecraft/server/BlockSand.java b/src/main/java/net/minecraft/server/BlockSand.java index 487eb084..053b75e7 100644 --- a/src/main/java/net/minecraft/server/BlockSand.java +++ b/src/main/java/net/minecraft/server/BlockSand.java @@ -8,27 +8,30 @@ public class BlockSand extends Block { public BlockSand(int i, int j) { super(i, j, Material.SAND); + this.a(CreativeModeTab.b); } public void onPlace(World world, int i, int j, int k) { - world.c(i, j, k, this.id, this.d()); + world.a(i, j, k, this.id, this.p_()); } public void doPhysics(World world, int i, int j, int k, int l) { - world.c(i, j, k, this.id, this.d()); + world.a(i, j, k, this.id, this.p_()); } - public void a(World world, int i, int j, int k, Random random) { - this.h(world, i, j, k); + public void b(World world, int i, int j, int k, Random random) { + if (!world.isStatic) { + this.l(world, i, j, k); + } } - private void h(World world, int i, int j, int k) { + private void l(World world, int i, int j, int k) { if (canFall(world, i, j - 1, k) && j >= 0) { byte b0 = 32; - if (!instaFall && world.a(i - b0, j - b0, k - b0, i + b0, j + b0, k + b0)) { + if (!instaFall && world.c(i - b0, j - b0, k - b0, i + b0, j + b0, k + b0)) { if (!world.isStatic) { - // CraftBukkit - Change call to add data + // CraftBukkit - change call to add data EntityFallingBlock entityfallingblock = new EntityFallingBlock(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.id, world.getData(i, j, k)); world.addEntity(entityfallingblock); @@ -47,7 +50,7 @@ public class BlockSand extends Block { } } - public int d() { + public int p_() { return 3; } |