Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated CraftBukkit to 1.2

Browse Source
This commit is contained in:
Nathan Adams
2012-03-01 10:49:23 +00:00
parent e9ca87000c
commit 543c4879fe
143 changed files with 3710 additions and 4433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/minecraft/server/TileEntityPiston.java
View File

@@ -29,7 +29,7 @@ public class TileEntityPiston extends TileEntity {
return this.a;
}
public int j() {
public int k() {
return this.b;
}
@@ -59,7 +59,7 @@ public class TileEntityPiston extends TileEntity {
AxisAlignedBB axisalignedbb = Block.PISTON_MOVING.b(this.world, this.x, this.y, this.z, this.a, f, this.c);
if (axisalignedbb != null) {
List list = this.world.getEntities(null, axisalignedbb);
List list = this.world.getEntities((Entity) null, axisalignedbb);
if (!list.isEmpty()) {
h.addAll(list);
@@ -79,22 +79,22 @@ public class TileEntityPiston extends TileEntity {
public void g() {
if (this.g < 1.0F && this.world != null) {
this.g = this.f = 1.0F;
this.world.n(this.x, this.y, this.z);
this.i();
this.world.q(this.x, this.y, this.z);
this.j();
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);
}
}
}
public void l_() {
public void q_() {
if (this.world == null) return; // CraftBukkit
this.g = this.f;
if (this.g >= 1.0F) {
this.a(1.0F, 0.25F);
this.world.n(this.x, this.y, this.z);
this.i();
this.world.q(this.x, this.y, this.z);
this.j();
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);
}