Update CraftBukkit to Minecraft 1.4(.2).

This commit is contained in:
Travis Watkins
2012-10-24 22:53:23 -05:00
committed by EvilSeph
parent b9a72531b6
commit 60819c6693
237 changed files with 10104 additions and 4863 deletions

View File

@@ -29,7 +29,7 @@ public class TileEntityPiston extends TileEntity {
return this.a;
}
public int n() {
public int p() {
return this.b;
}
@@ -76,11 +76,11 @@ public class TileEntityPiston extends TileEntity {
}
}
public void i() {
public void f() {
if (this.g < 1.0F && this.world != null) {
this.g = this.f = 1.0F;
this.world.q(this.x, this.y, this.z);
this.j();
this.w_();
if (this.world.getTypeId(this.x, this.y, this.z) == Block.PISTON_MOVING.id) {
this.world.setTypeIdAndData(this.x, this.y, this.z, this.a, this.b);
}
@@ -94,7 +94,7 @@ public class TileEntityPiston extends TileEntity {
if (this.g >= 1.0F) {
this.a(1.0F, 0.25F);
this.world.q(this.x, this.y, this.z);
this.j();
this.w_();
if (this.world.getTypeId(this.x, this.y, this.z) == Block.PISTON_MOVING.id) {
this.world.setTypeIdAndData(this.x, this.y, this.z, this.a, this.b);
}