Update CraftBukkit to Minecraft 1.5
This commit is contained in:
@@ -23,13 +23,13 @@ public class EntityGhast extends EntityFlying implements IMonster {
|
||||
this.texture = "/mob/ghast.png";
|
||||
this.a(4.0F, 4.0F);
|
||||
this.fireProof = true;
|
||||
this.bd = 5;
|
||||
this.be = 5;
|
||||
}
|
||||
|
||||
public boolean damageEntity(DamageSource damagesource, int i) {
|
||||
if (this.isInvulnerable()) {
|
||||
return false;
|
||||
} else if ("fireball".equals(damagesource.l()) && damagesource.getEntity() instanceof EntityHuman) {
|
||||
} else if ("fireball".equals(damagesource.n()) && damagesource.getEntity() instanceof EntityHuman) {
|
||||
super.damageEntity(damagesource, 1000);
|
||||
((EntityHuman) damagesource.getEntity()).a((Statistic) AchievementList.y);
|
||||
return true;
|
||||
@@ -47,19 +47,19 @@ public class EntityGhast extends EntityFlying implements IMonster {
|
||||
return 10;
|
||||
}
|
||||
|
||||
public void j_() {
|
||||
super.j_();
|
||||
public void l_() {
|
||||
super.l_();
|
||||
byte b0 = this.datawatcher.getByte(16);
|
||||
|
||||
this.texture = b0 == 1 ? "/mob/ghast_fire.png" : "/mob/ghast.png";
|
||||
}
|
||||
|
||||
protected void bn() {
|
||||
protected void bq() {
|
||||
if (!this.world.isStatic && this.world.difficulty == 0) {
|
||||
this.die();
|
||||
}
|
||||
|
||||
this.bk();
|
||||
this.bn();
|
||||
this.f = this.g;
|
||||
double d0 = this.c - this.locX;
|
||||
double d1 = this.d - this.locY;
|
||||
@@ -130,7 +130,7 @@ public class EntityGhast extends EntityFlying implements IMonster {
|
||||
double d6 = this.target.boundingBox.b + (double) (this.target.length / 2.0F) - (this.locY + (double) (this.length / 2.0F));
|
||||
double d7 = this.target.locZ - this.locZ;
|
||||
|
||||
this.ax = this.yaw = -((float) Math.atan2(d5, d7)) * 180.0F / 3.1415927F;
|
||||
this.ay = this.yaw = -((float) Math.atan2(d5, d7)) * 180.0F / 3.1415927F;
|
||||
if (this.n(this.target)) {
|
||||
if (this.g == 10) {
|
||||
this.world.a((EntityHuman) null, 1007, (int) this.locX, (int) this.locY, (int) this.locZ, 0);
|
||||
@@ -156,7 +156,7 @@ public class EntityGhast extends EntityFlying implements IMonster {
|
||||
--this.g;
|
||||
}
|
||||
} else {
|
||||
this.ax = this.yaw = -((float) Math.atan2(this.motX, this.motZ)) * 180.0F / 3.1415927F;
|
||||
this.ay = this.yaw = -((float) Math.atan2(this.motX, this.motZ)) * 180.0F / 3.1415927F;
|
||||
if (this.g > 0) {
|
||||
--this.g;
|
||||
}
|
||||
@@ -188,15 +188,15 @@ public class EntityGhast extends EntityFlying implements IMonster {
|
||||
return true;
|
||||
}
|
||||
|
||||
protected String aY() {
|
||||
protected String bb() {
|
||||
return "mob.ghast.moan";
|
||||
}
|
||||
|
||||
protected String aZ() {
|
||||
protected String bc() {
|
||||
return "mob.ghast.scream";
|
||||
}
|
||||
|
||||
protected String ba() {
|
||||
protected String bd() {
|
||||
return "mob.ghast.death";
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ public class EntityGhast extends EntityFlying implements IMonster {
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
protected float aX() {
|
||||
protected float ba() {
|
||||
return 10.0F;
|
||||
}
|
||||
|
||||
@@ -233,7 +233,7 @@ public class EntityGhast extends EntityFlying implements IMonster {
|
||||
return this.random.nextInt(20) == 0 && super.canSpawn() && this.world.difficulty > 0;
|
||||
}
|
||||
|
||||
public int bv() {
|
||||
public int by() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user