From 385ace970ee7b7912419d601b8a0867c4c2794df Mon Sep 17 00:00:00 2001 From: Nate Mortensen Date: Thu, 20 Mar 2014 22:26:30 -0600 Subject: Update CraftBukkit to Minecraft 1.7.5 --- .../java/net/minecraft/server/EntityWither.java | 52 +++++++++++----------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'src/main/java/net/minecraft/server/EntityWither.java') diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java index 04d624e9..99526b99 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -45,7 +45,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { public void b(NBTTagCompound nbttagcompound) { super.b(nbttagcompound); - nbttagcompound.setInt("Invul", this.bY()); + nbttagcompound.setInt("Invul", this.ca()); } public void a(NBTTagCompound nbttagcompound) { @@ -57,11 +57,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity { return "mob.wither.idle"; } - protected String aT() { + protected String aS() { return "mob.wither.hurt"; } - protected String aU() { + protected String aT() { return "mob.wither.death"; } @@ -75,7 +75,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { Entity entity = this.world.getEntity(this.t(0)); if (entity != null) { - if (this.locY < entity.locY || !this.bZ() && this.locY < entity.locY + 5.0D) { + if (this.locY < entity.locY || !this.cb() && this.locY < entity.locY + 5.0D) { if (this.motY < 0.0D) { this.motY = 0.0D; } @@ -132,11 +132,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity { this.bp[i] = this.b(this.bp[i], f1, 40.0F); this.bq[i] = this.b(this.bq[i], f, 10.0F); } else { - this.bq[i] = this.b(this.bq[i], this.aN, 10.0F); + this.bq[i] = this.b(this.bq[i], this.aM, 10.0F); } } - boolean flag = this.bZ(); + boolean flag = this.cb(); for (j = 0; j < 3; ++j) { double d8 = this.u(j); @@ -149,18 +149,18 @@ public class EntityWither extends EntityMonster implements IRangedEntity { } } - if (this.bY() > 0) { + if (this.ca() > 0) { for (j = 0; j < 3; ++j) { this.world.addParticle("mobSpell", this.locX + this.random.nextGaussian() * 1.0D, this.locY + (double) (this.random.nextFloat() * 3.3F), this.locZ + this.random.nextGaussian() * 1.0D, 0.699999988079071D, 0.699999988079071D, 0.8999999761581421D); } } } - protected void bn() { + protected void bm() { int i; - if (this.bY() > 0) { - i = this.bY() - 1; + if (this.ca() > 0) { + i = this.ca() - 1; if (i <= 0) { // CraftBukkit start ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 7.0F, false); @@ -180,7 +180,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { this.heal(10.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER_SPAWN); // CraftBukkit } } else { - super.bn(); + super.bm(); int j; @@ -208,7 +208,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { if (j > 0) { Entity entity = this.world.getEntity(j); - if (entity != null && entity.isAlive() && this.e(entity) <= 900.0D && this.o(entity)) { + if (entity != null && entity.isAlive() && this.f(entity) <= 900.0D && this.p(entity)) { this.a(i + 1, (EntityLiving) entity); this.bt[i - 1] = this.ticksLived + 40 + this.random.nextInt(20); this.bu[i - 1] = 0; @@ -221,7 +221,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { for (int i1 = 0; i1 < 10 && !list.isEmpty(); ++i1) { EntityLiving entityliving = (EntityLiving) list.get(this.random.nextInt(list.size())); - if (entityliving != this && entityliving.isAlive() && this.o(entityliving)) { + if (entityliving != this && entityliving.isAlive() && this.p(entityliving)) { if (entityliving instanceof EntityHuman) { if (!((EntityHuman) entityliving).abilities.isInvulnerable) { this.b(i, entityliving.getId()); @@ -285,14 +285,14 @@ public class EntityWither extends EntityMonster implements IRangedEntity { } } - public void bX() { + public void bZ() { this.s(220); this.setHealth(this.getMaxHealth() / 3.0F); } - public void as() {} + public void ar() {} - public int aV() { + public int aU() { return 4; } @@ -300,7 +300,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { if (i <= 0) { return this.locX; } else { - float f = (this.aN + (float) (180 * (i - 1))) / 180.0F * 3.1415927F; + float f = (this.aM + (float) (180 * (i - 1))) / 180.0F * 3.1415927F; float f1 = MathHelper.cos(f); return this.locX + (double) f1 * 1.3D; @@ -315,7 +315,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { if (i <= 0) { return this.locZ; } else { - float f = (this.aN + (float) (180 * (i - 1))) / 180.0F * 3.1415927F; + float f = (this.aM + (float) (180 * (i - 1))) / 180.0F * 3.1415927F; float f1 = MathHelper.sin(f); return this.locZ + (double) f1 * 1.3D; @@ -369,12 +369,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity { return false; } else if (damagesource == DamageSource.DROWN) { return false; - } else if (this.bY() > 0) { + } else if (this.ca() > 0) { return false; } else { Entity entity; - if (this.bZ()) { + if (this.cb()) { entity = damagesource.i(); if (entity instanceof EntityArrow) { return false; @@ -416,25 +416,25 @@ public class EntityWither extends EntityMonster implements IRangedEntity { } protected void w() { - this.aV = 0; + this.aU = 0; } protected void b(float f) {} public void addEffect(MobEffect mobeffect) {} - protected boolean bk() { + protected boolean bj() { return true; } - protected void aD() { - super.aD(); + protected void aC() { + super.aC(); this.getAttributeInstance(GenericAttributes.a).setValue(300.0D); this.getAttributeInstance(GenericAttributes.d).setValue(0.6000000238418579D); this.getAttributeInstance(GenericAttributes.b).setValue(40.0D); } - public int bY() { + public int ca() { return this.datawatcher.getInt(20); } @@ -450,7 +450,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { this.datawatcher.watch(17 + i, Integer.valueOf(j)); } - public boolean bZ() { + public boolean cb() { return this.getHealth() <= this.getMaxHealth() / 2.0F; } -- cgit v1.2.3