Update CraftBukkit to Minecraft 1.3.1

This commit is contained in:
feildmaster
2012-07-29 02:33:13 -05:00
committed by Travis Watkins
parent 08e2923bd4
commit a43d621c01
240 changed files with 10763 additions and 9150 deletions

View File

@@ -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;
}