Update CraftBukkit to 1.6.4

This commit is contained in:
feildmaster
2013-09-19 13:25:08 -05:00
parent e20ef1f606
commit dcb9d6a5ef
92 changed files with 730 additions and 694 deletions

View File

@@ -86,7 +86,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
}
if (this.bQ()) {
this.makeSound(this.bP(), this.aZ(), ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) / 0.8F);
this.makeSound(this.bP(), this.ba(), ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) / 0.8F);
}
this.h = -0.5F;
@@ -101,8 +101,8 @@ public class EntitySlime extends EntityInsentient implements IMonster {
}
}
protected void bk() {
this.bo();
protected void bl() {
this.u();
// CraftBukkit start
Entity entityhuman = this.world.findNearbyVulnerablePlayer(this, 16.0D); // EntityHuman -> Entity
EntityTargetEvent event = null;
@@ -132,7 +132,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
this.bd = true;
if (this.bS()) {
this.makeSound(this.bP(), this.aZ(), ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) * 0.8F);
this.makeSound(this.bP(), this.ba(), ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) * 0.8F);
}
this.be = 1.0F - this.random.nextFloat() * 2.0F;
@@ -207,11 +207,11 @@ public class EntitySlime extends EntityInsentient implements IMonster {
return this.getSize();
}
protected String aN() {
protected String aO() {
return "mob.slime." + (this.getSize() > 1 ? "big" : "small");
}
protected String aO() {
protected String aP() {
return "mob.slime." + (this.getSize() > 1 ? "big" : "small");
}
@@ -241,7 +241,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
}
}
protected float aZ() {
protected float ba() {
return 0.4F * (float) this.getSize();
}