diff options
author | Erik Broes <erikbroes@grum.nl> | 2011-11-20 00:01:14 -0800 |
---|---|---|
committer | Erik Broes <erikbroes@ripe.net> | 2011-11-20 00:01:33 -0800 |
commit | 345ea36c7bb3383c6e4825355d0043a646194eaa (patch) | |
tree | df116b57d92315c0a13c2fdc87d792b031c7239a /src/main/java/net/minecraft/server/BlockSand.java | |
parent | 589f66bd1b766dc1fdd737ee885304196a2ed86a (diff) | |
download | craftbukkit-345ea36c7bb3383c6e4825355d0043a646194eaa.tar craftbukkit-345ea36c7bb3383c6e4825355d0043a646194eaa.tar.gz craftbukkit-345ea36c7bb3383c6e4825355d0043a646194eaa.tar.lz craftbukkit-345ea36c7bb3383c6e4825355d0043a646194eaa.tar.xz craftbukkit-345ea36c7bb3383c6e4825355d0043a646194eaa.zip |
Update for 1.0.0
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockSand.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockSand.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/main/java/net/minecraft/server/BlockSand.java b/src/main/java/net/minecraft/server/BlockSand.java index cc4ef57e..bc38fccb 100644 --- a/src/main/java/net/minecraft/server/BlockSand.java +++ b/src/main/java/net/minecraft/server/BlockSand.java @@ -11,30 +11,32 @@ public class BlockSand extends Block { } public void a(World world, int i, int j, int k) { - world.c(i, j, k, this.id, this.c()); + world.c(i, j, k, this.id, this.d()); } public void doPhysics(World world, int i, int j, int k, int l) { - world.c(i, j, k, this.id, this.c()); + world.c(i, j, k, this.id, this.d()); } public void a(World world, int i, int j, int k, Random random) { - this.g(world, i, j, k); + this.h(world, i, j, k); } - private void g(World world, int i, int j, int k) { - if (d_(world, i, j - 1, k) && j >= 0) { + private void h(World world, int i, int j, int k) { + if (g(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)) { - // CraftBukkit Change call to add data - EntityFallingSand entityfallingsand = new EntityFallingSand(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.id, world.getData(i, j, k)); + if (!world.isStatic) { + // CraftBukkit Change call to add data + EntityFallingSand entityfallingsand = new EntityFallingSand(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(entityfallingsand); + world.addEntity(entityfallingsand); + } } else { world.setTypeId(i, j, k, 0); - while (d_(world, i, j - 1, k) && j > 0) { + while (g(world, i, j - 1, k) && j > 0) { --j; } @@ -45,11 +47,11 @@ public class BlockSand extends Block { } } - public int c() { + public int d() { return 3; } - public static boolean d_(World world, int i, int j, int k) { + public static boolean g(World world, int i, int j, int k) { int l = world.getTypeId(i, j, k); if (l == 0) { |