Update CraftBukkit to 1.6.1

This commit is contained in:
Nate Mortensen
2013-07-01 06:03:00 -05:00
committed by Wesley Wolfe
parent f887b76a25
commit 6c09066e22
228 changed files with 6426 additions and 5442 deletions

View File

@@ -4,28 +4,31 @@ public class EntityMagmaCube extends EntitySlime {
public EntityMagmaCube(World world) {
super(world);
this.texture = "/mob/lava.png";
this.fireProof = true;
this.aO = 0.2F;
}
protected void ax() {
super.ax();
this.a(GenericAttributes.d).a(0.20000000298023224D);
}
public boolean canSpawn() {
return this.world.difficulty > 0 && this.world.b(this.boundingBox) && this.world.getCubes(this, this.boundingBox).isEmpty() && !this.world.containsLiquid(this.boundingBox);
}
public int aZ() {
public int aM() {
return this.getSize() * 3;
}
public float c(float f) {
public float d(float f) {
return 1.0F;
}
protected String h() {
protected String bF() {
return "flame";
}
protected EntitySlime i() {
protected EntitySlime bG() {
return new EntityMagmaCube(this.world);
}
@@ -58,38 +61,38 @@ public class EntityMagmaCube extends EntitySlime {
return false;
}
protected int j() {
return super.j() * 4;
protected int bH() {
return super.bH() * 4;
}
protected void k() {
this.b *= 0.9F;
protected void bI() {
this.h *= 0.9F;
}
protected void bl() {
protected void ba() {
this.motY = (double) (0.42F + (float) this.getSize() * 0.1F);
this.an = true;
}
protected void a(float f) {}
protected void b(float f) {}
protected boolean l() {
protected boolean bJ() {
return true;
}
protected int m() {
return super.m() + 2;
protected int bK() {
return super.bK() + 2;
}
protected String bc() {
protected String aK() {
return "mob.slime." + (this.getSize() > 1 ? "big" : "small");
}
protected String bd() {
protected String aL() {
return "mob.slime." + (this.getSize() > 1 ? "big" : "small");
}
protected String n() {
protected String bL() {
return this.getSize() > 1 ? "mob.magmacube.big" : "mob.magmacube.small";
}
@@ -97,7 +100,7 @@ public class EntityMagmaCube extends EntitySlime {
return false;
}
protected boolean o() {
protected boolean bM() {
return true;
}
}