Update CraftBukkit to 1.6.4
This commit is contained in:
@@ -25,8 +25,8 @@ public class EntitySquid extends EntityWaterAnimal {
|
||||
this.by = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F;
|
||||
}
|
||||
|
||||
protected void ay() {
|
||||
super.ay();
|
||||
protected void az() {
|
||||
super.az();
|
||||
this.getAttributeInstance(GenericAttributes.a).setValue(10.0D);
|
||||
}
|
||||
|
||||
@@ -34,15 +34,15 @@ public class EntitySquid extends EntityWaterAnimal {
|
||||
return null;
|
||||
}
|
||||
|
||||
protected String aN() {
|
||||
return null;
|
||||
}
|
||||
|
||||
protected String aO() {
|
||||
return null;
|
||||
}
|
||||
|
||||
protected float aZ() {
|
||||
protected String aP() {
|
||||
return null;
|
||||
}
|
||||
|
||||
protected float ba() {
|
||||
return 0.4F;
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ public class EntitySquid extends EntityWaterAnimal {
|
||||
}
|
||||
|
||||
/* CraftBukkit start - Delegate to Entity to use existing inWater value
|
||||
public boolean G() {
|
||||
public boolean H() {
|
||||
return this.world.a(this.boundingBox.grow(0.0D, -0.6000000238418579D, 0.0D), Material.WATER, (Entity) this);
|
||||
}
|
||||
// CraftBukkit end */
|
||||
@@ -87,7 +87,7 @@ public class EntitySquid extends EntityWaterAnimal {
|
||||
}
|
||||
}
|
||||
|
||||
if (this.G()) {
|
||||
if (this.H()) {
|
||||
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 bk() {
|
||||
protected void bl() {
|
||||
++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.bo();
|
||||
this.u();
|
||||
}
|
||||
|
||||
public boolean canSpawn() {
|
||||
|
||||
Reference in New Issue
Block a user