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

@@ -25,32 +25,32 @@ public class EntitySquid extends EntityWaterAnimal {
this.by = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F;
}
protected void az() {
super.az();
protected void aD() {
super.aD();
this.getAttributeInstance(GenericAttributes.a).setValue(10.0D);
}
protected String r() {
protected String t() {
return null;
}
protected String aO() {
protected String aT() {
return null;
}
protected String aP() {
protected String aU() {
return null;
}
protected float ba() {
protected float bf() {
return 0.4F;
}
protected int getLootId() {
return 0;
protected Item getLoot() {
return Item.d(0);
}
protected boolean e_() {
protected boolean g_() {
return false;
}
@@ -68,13 +68,13 @@ public class EntitySquid extends EntityWaterAnimal {
}
/* CraftBukkit start - Delegate to Entity to use existing inWater value
public boolean H() {
public boolean M() {
return this.world.a(this.boundingBox.grow(0.0D, -0.6000000238418579D, 0.0D), Material.WATER, (Entity) this);
}
// CraftBukkit end */
public void c() {
super.c();
public void e() {
super.e();
this.bq = this.bp;
this.bs = this.br;
this.bu = this.bt;
@@ -87,7 +87,7 @@ public class EntitySquid extends EntityWaterAnimal {
}
}
if (this.H()) {
if (this.M()) {
float f;
if (this.bt < 3.1415927F) {
@@ -135,7 +135,7 @@ public class EntitySquid extends EntityWaterAnimal {
this.move(this.motX, this.motY, this.motZ);
}
protected void bl() {
protected void bq() {
++this.aV;
if (this.aV > 100) {
this.bA = this.bB = this.bC = 0.0F;
@@ -147,7 +147,7 @@ public class EntitySquid extends EntityWaterAnimal {
this.bC = MathHelper.sin(f) * 0.2F;
}
this.u();
this.w();
}
public boolean canSpawn() {