Update CraftBukkit to Minecraft 1.4(.2).

This commit is contained in:
Travis Watkins
2012-10-24 22:53:23 -05:00
committed by EvilSeph
parent b9a72531b6
commit 60819c6693
237 changed files with 10104 additions and 4863 deletions

View File

@@ -10,15 +10,14 @@ public class EntitySilverfish extends EntityMonster {
super(world);
this.texture = "/mob/silverfish.png";
this.a(0.3F, 0.7F);
this.bw = 0.6F;
this.damage = 1;
this.bI = 0.6F;
}
public int getMaxHealth() {
return 8;
}
protected boolean e_() {
protected boolean f_() {
return false;
}
@@ -28,15 +27,15 @@ public class EntitySilverfish extends EntityMonster {
return this.world.findNearbyVulnerablePlayer(this, d0);
}
protected String aQ() {
protected String aW() {
return "mob.silverfish.say";
}
protected String aR() {
protected String aX() {
return "mob.silverfish.hit";
}
protected String aS() {
protected String aY() {
return "mob.silverfish.kill";
}
@@ -51,25 +50,25 @@ public class EntitySilverfish extends EntityMonster {
protected void a(Entity entity, float f) {
if (this.attackTicks <= 0 && f < 1.2F && entity.boundingBox.e > this.boundingBox.b && entity.boundingBox.b < this.boundingBox.e) {
this.attackTicks = 20;
entity.damageEntity(DamageSource.mobAttack(this), this.damage);
entity.damageEntity(DamageSource.mobAttack(this), this.c(entity));
}
}
protected void a(int i, int j, int k, int l) {
this.world.makeSound(this, "mob.silverfish.step", 1.0F, 1.0F);
this.world.makeSound(this, "mob.silverfish.step", 0.15F, 1.0F);
}
protected int getLootId() {
return 0;
}
public void h_() {
this.aq = this.yaw;
super.h_();
public void j_() {
this.aw = this.yaw;
super.j_();
}
protected void be() {
super.be();
protected void bk() {
super.bk();
if (!this.world.isStatic) {
int i;
int j;
@@ -110,7 +109,7 @@ public class EntitySilverfish extends EntityMonster {
}
}
if (this.target == null && !this.l()) {
if (this.target == null && !this.k()) {
i = MathHelper.floor(this.locX);
j = MathHelper.floor(this.locY + 0.5D);
k = MathHelper.floor(this.locZ);
@@ -125,12 +124,12 @@ public class EntitySilverfish extends EntityMonster {
// CraftBukkit end
this.world.setTypeIdAndData(i + Facing.b[l1], j + Facing.c[l1], k + Facing.d[l1], Block.MONSTER_EGGS.id, BlockMonsterEggs.f(l));
this.aK();
this.aQ();
this.die();
} else {
this.j();
this.i();
}
} else if (this.target != null && !this.l()) {
} else if (this.target != null && !this.k()) {
this.target = null;
}
}
@@ -140,7 +139,7 @@ public class EntitySilverfish extends EntityMonster {
return this.world.getTypeId(i, j - 1, k) == Block.STONE.id ? 10.0F : super.a(i, j, k);
}
protected boolean o() {
protected boolean i_() {
return true;
}
@@ -154,6 +153,10 @@ public class EntitySilverfish extends EntityMonster {
}
}
public int c(Entity entity) {
return 1;
}
public EnumMonsterType getMonsterType() {
return EnumMonsterType.ARTHROPOD;
}