Update CraftBukkit to Minecraft 1.7.2

This commit is contained in:
mbax
2013-11-04 07:07:38 -06:00
committed by Wesley Wolfe
parent ff8b70fbb7
commit 2726696652
349 changed files with 14339 additions and 11287 deletions

View File

@@ -8,19 +8,19 @@ public abstract class BlockPressurePlateAbstract extends Block {
private String a;
protected BlockPressurePlateAbstract(int i, String s, Material material) {
super(i, material);
protected BlockPressurePlateAbstract(String s, Material material) {
super(material);
this.a = s;
this.a(CreativeModeTab.d);
this.b(true);
this.c_(this.d(15));
this.a(true);
this.b(this.d(15));
}
public void updateShape(IBlockAccess iblockaccess, int i, int j, int k) {
this.c_(iblockaccess.getData(i, j, k));
this.b(iblockaccess.getData(i, j, k));
}
protected void c_(int i) {
protected void b(int i) {
boolean flag = this.c(i) > 0;
float f = 0.0625F;
@@ -35,7 +35,7 @@ public abstract class BlockPressurePlateAbstract extends Block {
return 20;
}
public AxisAlignedBB b(World world, int i, int j, int k) {
public AxisAlignedBB a(World world, int i, int j, int k) {
return null;
}
@@ -43,7 +43,7 @@ public abstract class BlockPressurePlateAbstract extends Block {
return false;
}
public boolean b() {
public boolean d() {
return false;
}
@@ -52,18 +52,18 @@ public abstract class BlockPressurePlateAbstract extends Block {
}
public boolean canPlace(World world, int i, int j, int k) {
return world.w(i, j - 1, k) || BlockFence.n_(world.getTypeId(i, j - 1, k));
return World.a((IBlockAccess) world, i, j - 1, k) || BlockFence.a(world.getType(i, j - 1, k));
}
public void doPhysics(World world, int i, int j, int k, int l) {
public void doPhysics(World world, int i, int j, int k, Block block) {
boolean flag = false;
if (!world.w(i, j - 1, k) && !BlockFence.n_(world.getTypeId(i, j - 1, k))) {
if (!World.a((IBlockAccess) world, i, j - 1, k) && !BlockFence.a(world.getType(i, j - 1, k))) {
flag = true;
}
if (flag) {
this.c(world, i, j, k, world.getData(i, j, k), 0);
this.b(world, i, j, k, world.getData(i, j, k), 0);
world.setAir(i, j, k);
}
}
@@ -73,7 +73,7 @@ public abstract class BlockPressurePlateAbstract extends Block {
int l = this.c(world.getData(i, j, k));
if (l > 0) {
this.b(world, i, j, k, l);
this.a(world, i, j, k, l);
}
}
}
@@ -83,12 +83,12 @@ public abstract class BlockPressurePlateAbstract extends Block {
int l = this.c(world.getData(i, j, k));
if (l == 0) {
this.b(world, i, j, k, l);
this.a(world, i, j, k, l);
}
}
}
protected void b(World world, int i, int j, int k, int l) {
protected void a(World world, int i, int j, int k, int l) {
int i1 = this.e(world, i, j, k);
boolean flag = l > 0;
boolean flag1 = i1 > 0;
@@ -108,8 +108,8 @@ public abstract class BlockPressurePlateAbstract extends Block {
if (l != i1) {
world.setData(i, j, k, this.d(i1), 2);
this.b_(world, i, j, k);
world.g(i, j, k, i, j, k);
this.a_(world, i, j, k);
world.c(i, j, k, i, j, k);
}
if (!flag1 && flag) {
@@ -119,7 +119,7 @@ public abstract class BlockPressurePlateAbstract extends Block {
}
if (flag1) {
world.a(i, j, k, this.id, this.a(world));
world.a(i, j, k, this, this.a(world));
}
}
@@ -129,17 +129,17 @@ public abstract class BlockPressurePlateAbstract extends Block {
return AxisAlignedBB.a().a((double) ((float) i + f), (double) j, (double) ((float) k + f), (double) ((float) (i + 1) - f), (double) j + 0.25D, (double) ((float) (k + 1) - f));
}
public void remove(World world, int i, int j, int k, int l, int i1) {
if (this.c(i1) > 0) {
this.b_(world, i, j, k);
public void remove(World world, int i, int j, int k, Block block, int l) {
if (this.c(l) > 0) {
this.a_(world, i, j, k);
}
super.remove(world, i, j, k, l, i1);
super.remove(world, i, j, k, block, l);
}
protected void b_(World world, int i, int j, int k) {
world.applyPhysics(i, j, k, this.id);
world.applyPhysics(i, j - 1, k, this.id);
protected void a_(World world, int i, int j, int k) {
world.applyPhysics(i, j, k, this);
world.applyPhysics(i, j - 1, k, this);
}
public int b(IBlockAccess iblockaccess, int i, int j, int k, int l) {