diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2014-06-26 13:05:08 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2014-07-08 14:31:10 -0500 |
commit | dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00 (patch) | |
tree | 062b1b273d0e0f337fde6b79f9377519d85c48c5 /src/main/java/net/minecraft/server/EntityLiving.java | |
parent | a8628fd645e12ec22bc525f49dd25f68d094f3ef (diff) | |
download | craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.gz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.lz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.xz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.zip |
Update CraftBukkit to Minecraft 1.7.10
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityLiving.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityLiving.java | 226 |
1 files changed, 113 insertions, 113 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index 095a97f8..f86d698a 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -84,9 +84,9 @@ public abstract class EntityLiving extends Entity { public EntityLiving(World world) { super(world); - this.aC(); + this.aD(); // CraftBukkit - setHealth(getMaxHealth()) inlined and simplified to skip the instanceof check for EntityPlayer, as getBukkitEntity() is not initialized in constructor - this.datawatcher.watch(6, (float) this.getAttributeInstance(GenericAttributes.a).getValue()); + this.datawatcher.watch(6, (float) this.getAttributeInstance(GenericAttributes.maxHealth).getValue()); this.k = true; this.aL = (float) (Math.random() + 1.0D) * 0.01F; this.setPosition(this.locX, this.locY, this.locZ); @@ -103,18 +103,18 @@ public abstract class EntityLiving extends Entity { this.datawatcher.a(6, Float.valueOf(1.0F)); } - protected void aC() { - this.bb().b(GenericAttributes.a); - this.bb().b(GenericAttributes.c); - this.bb().b(GenericAttributes.d); - if (!this.bj()) { + protected void aD() { + this.getAttributeMap().b(GenericAttributes.maxHealth); + this.getAttributeMap().b(GenericAttributes.c); + this.getAttributeMap().b(GenericAttributes.d); + if (!this.bk()) { this.getAttributeInstance(GenericAttributes.d).setValue(0.10000000149011612D); } } protected void a(double d0, boolean flag) { - if (!this.L()) { - this.M(); + if (!this.M()) { + this.N(); } if (flag && this.fallDistance > 0.0F) { @@ -146,13 +146,13 @@ public abstract class EntityLiving extends Entity { super.a(d0, flag); } - public boolean aD() { + public boolean aE() { return false; } - public void B() { + public void C() { this.aC = this.aD; - super.B(); + super.C(); this.world.methodProfiler.a("livingEntityBaseTick"); if (this.isAlive() && this.inBlock()) { this.damageEntity(DamageSource.STUCK, 1.0F); @@ -165,7 +165,7 @@ public abstract class EntityLiving extends Entity { boolean flag = this instanceof EntityHuman && ((EntityHuman) this).abilities.isInvulnerable; if (this.isAlive() && this.a(Material.WATER)) { - if (!this.aD() && !this.hasEffect(MobEffectList.WATER_BREATHING.id) && !flag) { + if (!this.aE() && !this.hasEffect(MobEffectList.WATER_BREATHING.id) && !flag) { this.setAirTicks(this.j(this.getAirTicks())); if (this.getAirTicks() == -20) { this.setAirTicks(0); @@ -182,7 +182,7 @@ public abstract class EntityLiving extends Entity { } } - if (!this.world.isStatic && this.al() && this.vehicle instanceof EntityLiving) { + if (!this.world.isStatic && this.am() && this.vehicle instanceof EntityLiving) { this.mount((Entity) null); } } else { @@ -193,7 +193,7 @@ public abstract class EntityLiving extends Entity { // CraftBukkit end } - if (this.isAlive() && this.K()) { + if (this.isAlive() && this.L()) { this.extinguish(); } @@ -211,7 +211,7 @@ public abstract class EntityLiving extends Entity { } if (this.getHealth() <= 0.0F) { - this.aE(); + this.aF(); } if (this.lastDamageByPlayerTime > 0) { @@ -232,7 +232,7 @@ public abstract class EntityLiving extends Entity { } } - this.aN(); + this.aO(); this.aY = this.aX; this.aN = this.aM; this.aP = this.aO; @@ -245,7 +245,7 @@ public abstract class EntityLiving extends Entity { public int getExpReward() { int exp = this.getExpValue(this.killer); - if (!this.world.isStatic && (this.lastDamageByPlayerTime > 0 || this.alwaysGivesExp()) && this.aF() && this.world.getGameRules().getBoolean("doMobLoot")) { + if (!this.world.isStatic && (this.lastDamageByPlayerTime > 0 || this.alwaysGivesExp()) && this.aG() && this.world.getGameRules().getBoolean("doMobLoot")) { return exp; } else { return 0; @@ -257,7 +257,7 @@ public abstract class EntityLiving extends Entity { return false; } - protected void aE() { + protected void aF() { ++this.deathTicks; if (this.deathTicks >= 20 && !this.dead) { // CraftBukkit - (this.deathTicks == 20) -> (this.deathTicks >= 20 && !this.dead) int i; @@ -285,7 +285,7 @@ public abstract class EntityLiving extends Entity { } } - protected boolean aF() { + protected boolean aG() { return !this.isBaby(); } @@ -303,7 +303,7 @@ public abstract class EntityLiving extends Entity { return false; } - public Random aH() { + public Random aI() { return this.random; } @@ -311,7 +311,7 @@ public abstract class EntityLiving extends Entity { return this.lastDamager; } - public int aJ() { + public int aK() { return this.bm; } @@ -320,11 +320,11 @@ public abstract class EntityLiving extends Entity { this.bm = this.ticksLived; } - public EntityLiving aK() { + public EntityLiving aL() { return this.bn; } - public int aL() { + public int aM() { return this.bo; } @@ -338,7 +338,7 @@ public abstract class EntityLiving extends Entity { this.bo = this.ticksLived; } - public int aM() { + public int aN() { return this.aU; } @@ -348,7 +348,7 @@ public abstract class EntityLiving extends Entity { nbttagcompound.setShort("HurtTime", (short) this.hurtTicks); nbttagcompound.setShort("DeathTime", (short) this.deathTicks); nbttagcompound.setShort("AttackTime", (short) this.attackTicks); - nbttagcompound.setFloat("AbsorptionAmount", this.br()); + nbttagcompound.setFloat("AbsorptionAmount", this.getAbsorptionHearts()); ItemStack[] aitemstack = this.getEquipment(); int i = aitemstack.length; @@ -362,7 +362,7 @@ public abstract class EntityLiving extends Entity { } } - nbttagcompound.set("Attributes", GenericAttributes.a(this.bb())); + nbttagcompound.set("Attributes", GenericAttributes.a(this.getAttributeMap())); aitemstack = this.getEquipment(); i = aitemstack.length; @@ -388,9 +388,9 @@ public abstract class EntityLiving extends Entity { } public void a(NBTTagCompound nbttagcompound) { - this.m(nbttagcompound.getFloat("AbsorptionAmount")); + this.setAbsorptionHearts(nbttagcompound.getFloat("AbsorptionAmount")); if (nbttagcompound.hasKeyOfType("Attributes", 9) && this.world != null && !this.world.isStatic) { - GenericAttributes.a(this.bb(), nbttagcompound.getList("Attributes", 10)); + GenericAttributes.a(this.getAttributeMap(), nbttagcompound.getList("Attributes", 10)); } if (nbttagcompound.hasKeyOfType("ActiveEffects", 9)) { @@ -410,9 +410,9 @@ public abstract class EntityLiving extends Entity { if (nbttagcompound.hasKey("Bukkit.MaxHealth")) { NBTBase nbtbase = nbttagcompound.get("Bukkit.MaxHealth"); if (nbtbase.getTypeId() == 5) { - this.getAttributeInstance(GenericAttributes.a).setValue((double) ((NBTTagFloat) nbtbase).c()); + this.getAttributeInstance(GenericAttributes.maxHealth).setValue((double) ((NBTTagFloat) nbtbase).c()); } else if (nbtbase.getTypeId() == 3) { - this.getAttributeInstance(GenericAttributes.a).setValue((double) ((NBTTagInt) nbtbase).d()); + this.getAttributeInstance(GenericAttributes.maxHealth).setValue((double) ((NBTTagInt) nbtbase).d()); } } // CraftBukkit end @@ -436,7 +436,7 @@ public abstract class EntityLiving extends Entity { this.attackTicks = nbttagcompound.getShort("AttackTime"); } - protected void aN() { + protected void aO() { Iterator iterator = this.effects.keySet().iterator(); while (iterator.hasNext()) { @@ -554,7 +554,7 @@ public abstract class EntityLiving extends Entity { return true; } - public boolean aQ() { + public boolean aR() { return this.getMonsterType() == EnumMonsterType.UNDEAD; } @@ -569,22 +569,22 @@ public abstract class EntityLiving extends Entity { protected void a(MobEffect mobeffect) { this.updateEffects = true; if (!this.world.isStatic) { - MobEffectList.byId[mobeffect.getEffectId()].b(this, this.bb(), mobeffect.getAmplifier()); + MobEffectList.byId[mobeffect.getEffectId()].b(this, this.getAttributeMap(), mobeffect.getAmplifier()); } } protected void a(MobEffect mobeffect, boolean flag) { this.updateEffects = true; if (flag && !this.world.isStatic) { - MobEffectList.byId[mobeffect.getEffectId()].a(this, this.bb(), mobeffect.getAmplifier()); - MobEffectList.byId[mobeffect.getEffectId()].b(this, this.bb(), mobeffect.getAmplifier()); + MobEffectList.byId[mobeffect.getEffectId()].a(this, this.getAttributeMap(), mobeffect.getAmplifier()); + MobEffectList.byId[mobeffect.getEffectId()].b(this, this.getAttributeMap(), mobeffect.getAmplifier()); } } protected void b(MobEffect mobeffect) { this.updateEffects = true; if (!this.world.isStatic) { - MobEffectList.byId[mobeffect.getEffectId()].a(this, this.bb(), mobeffect.getAmplifier()); + MobEffectList.byId[mobeffect.getEffectId()].a(this, this.getAttributeMap(), mobeffect.getAmplifier()); } } @@ -705,7 +705,7 @@ public abstract class EntityLiving extends Entity { if (flag) { this.world.broadcastEntityEffect(this, (byte) 2); if (damagesource != DamageSource.DROWN) { - this.P(); + this.Q(); } if (entity != null) { @@ -727,16 +727,16 @@ public abstract class EntityLiving extends Entity { String s; if (this.getHealth() <= 0.0F) { - s = this.aT(); + s = this.aU(); if (flag && s != null) { - this.makeSound(s, this.be(), this.bf()); + this.makeSound(s, this.bf(), this.bg()); } this.die(damagesource); } else { - s = this.aS(); + s = this.aT(); if (flag && s != null) { - this.makeSound(s, this.be(), this.bf()); + this.makeSound(s, this.bf(), this.bg()); } } @@ -758,13 +758,13 @@ public abstract class EntityLiving extends Entity { vec3d1.a(-this.pitch * 3.1415927F / 180.0F); vec3d1.b(-this.yaw * 3.1415927F / 180.0F); vec3d1 = vec3d1.add(this.locX, this.locY + (double) this.getHeadHeight(), this.locZ); - this.world.addParticle("iconcrack_" + Item.b(itemstack.getItem()), vec3d1.a, vec3d1.b, vec3d1.c, vec3d.a, vec3d.b + 0.05D, vec3d.c); + this.world.addParticle("iconcrack_" + Item.getId(itemstack.getItem()), vec3d1.a, vec3d1.b, vec3d1.c, vec3d.a, vec3d.b + 0.05D, vec3d.c); } } public void die(DamageSource damagesource) { Entity entity = damagesource.getEntity(); - EntityLiving entityliving = this.aW(); + EntityLiving entityliving = this.aX(); if (this.ba >= 0 && entityliving != null) { entityliving.b(this, this.ba); @@ -775,7 +775,7 @@ public abstract class EntityLiving extends Entity { } this.aT = true; - this.aV().g(); + this.aW().g(); if (!this.world.isStatic) { int i = 0; @@ -783,7 +783,7 @@ public abstract class EntityLiving extends Entity { i = EnchantmentManager.getBonusMonsterLootEnchantmentLevel((EntityLiving) entity); } - if (this.aF() && this.world.getGameRules().getBoolean("doMobLoot")) { + if (this.aG() && this.world.getGameRules().getBoolean("doMobLoot")) { this.drops = new ArrayList<org.bukkit.inventory.ItemStack>(); // CraftBukkit - Setup drop capture this.dropDeathLoot(this.lastDamageByPlayerTime > 0, i); @@ -828,11 +828,11 @@ public abstract class EntityLiving extends Entity { } } - protected String aS() { + protected String aT() { return "game.neutral.hurt"; } - protected String aT() { + protected String aU() { return "game.neutral.die"; } @@ -884,7 +884,7 @@ public abstract class EntityLiving extends Entity { return i > 4 ? "game.neutral.hurt.fall.big" : "game.neutral.hurt.fall.small"; } - public int aU() { + public int aV() { int i = 0; ItemStack[] aitemstack = this.getEquipment(); int j = aitemstack.length; @@ -902,22 +902,22 @@ public abstract class EntityLiving extends Entity { return i; } - protected void h(float f) {} + protected void damageArmor(float f) {} - protected float b(DamageSource damagesource, float f) { + protected float applyArmorModifier(DamageSource damagesource, float f) { if (!damagesource.ignoresArmor()) { - int i = 25 - this.aU(); + int i = 25 - this.aV(); float f1 = f * (float) i; - // this.h(f); // CraftBukkit - Moved into d(DamageSource, float) + // this.damageArmor(f); // CraftBukkit - Moved into d(DamageSource, float) f = f1 / 25.0F; } return f; } - protected float c(DamageSource damagesource, float f) { - if (damagesource.h()) { + protected float applyMagicModifier(DamageSource damagesource, float f) { + if (damagesource.isStarvation()) { return f; } else { if (this instanceof EntityZombie) { @@ -976,11 +976,11 @@ public abstract class EntityLiving extends Entity { } } // Armor modifier - f = this.b(damagesource, f); + f = this.applyArmorModifier(damagesource, f); float armorModifier = preDamage - f; preDamage = f; // Resistance Potion Effect - if (!damagesource.h() && this.hasEffect(MobEffectList.RESISTANCE) && damagesource != DamageSource.OUT_OF_WORLD) { + if (!damagesource.isStarvation() && this.hasEffect(MobEffectList.RESISTANCE) && damagesource != DamageSource.OUT_OF_WORLD) { int i = (this.getEffect(MobEffectList.RESISTANCE).getAmplifier() + 1) * 5; int j = 25 - i; float f1 = f * (float) j; @@ -989,12 +989,12 @@ public abstract class EntityLiving extends Entity { float resistanceModifier = preDamage - f; preDamage = f; // Magic modifier - f = this.c(damagesource, f); + f = this.applyMagicModifier(damagesource, f); float magicModifier = preDamage - f; float f1 = f; // Absorption modifier - f = Math.max(f - this.br(), 0.0F); + f = Math.max(f - this.getAbsorptionHearts(), 0.0F); float absorptionModifier = Math.max(f1 - f, 0.0F); EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, -hardHatModifier, -blockingModifier, -armorModifier, -resistanceModifier, -magicModifier, -absorptionModifier); @@ -1013,45 +1013,45 @@ public abstract class EntityLiving extends Entity { // Apply damage to armor if (!damagesource.ignoresArmor()) { float armorDamage = (float) (event.getDamage() + event.getDamage(DamageModifier.BLOCKING) + event.getDamage(DamageModifier.HARD_HAT)); - this.h(armorDamage); + this.damageArmor(armorDamage); } absorptionModifier = (float) -event.getDamage(DamageModifier.ABSORPTION); - this.m(Math.max(this.br() - absorptionModifier, 0.0F)); + this.setAbsorptionHearts(Math.max(this.getAbsorptionHearts() - absorptionModifier, 0.0F)); if (f != 0.0F) { if (human) { - ((EntityHuman) this).a(damagesource.f()); + ((EntityHuman) this).applyExhaustion(damagesource.getExhaustionCost()); } // CraftBukkit end float f2 = this.getHealth(); this.setHealth(f2 - f); - this.aV().a(damagesource, f2, f); + this.aW().a(damagesource, f2, f); // CraftBukkit start if (human) { return true; } // CraftBukkit end - this.m(this.br() - f); + this.setAbsorptionHearts(this.getAbsorptionHearts() - f); } return true; // CraftBukkit } return false; // CraftBukkit } - public CombatTracker aV() { + public CombatTracker aW() { return this.combatTracker; } - public EntityLiving aW() { + public EntityLiving aX() { return (EntityLiving) (this.combatTracker.c() != null ? this.combatTracker.c() : (this.killer != null ? this.killer : (this.lastDamager != null ? this.lastDamager : null))); } public final float getMaxHealth() { - return (float) this.getAttributeInstance(GenericAttributes.a).getValue(); + return (float) this.getAttributeInstance(GenericAttributes.maxHealth).getValue(); } - public final int aY() { + public final int aZ() { return this.datawatcher.getByte(9); } @@ -1063,7 +1063,7 @@ public abstract class EntityLiving extends Entity { return this.hasEffect(MobEffectList.FASTER_DIG) ? 6 - (1 + this.getEffect(MobEffectList.FASTER_DIG).getAmplifier()) * 1 : (this.hasEffect(MobEffectList.SLOWER_DIG) ? 6 + (1 + this.getEffect(MobEffectList.SLOWER_DIG).getAmplifier()) * 2 : 6); } - public void aZ() { + public void ba() { if (!this.at || this.au >= this.j() / 2 || this.au < 0) { this.au = -1; this.at = true; @@ -1073,11 +1073,11 @@ public abstract class EntityLiving extends Entity { } } - protected void F() { + protected void G() { this.damageEntity(DamageSource.OUT_OF_WORLD, 4.0F); } - protected void ba() { + protected void bb() { int i = this.j(); if (this.at) { @@ -1094,10 +1094,10 @@ public abstract class EntityLiving extends Entity { } public AttributeInstance getAttributeInstance(IAttribute iattribute) { - return this.bb().a(iattribute); + return this.getAttributeMap().a(iattribute); } - public AttributeMapBase bb() { + public AttributeMapBase getAttributeMap() { if (this.d == null) { this.d = new AttributeMapServer(); } @@ -1109,7 +1109,7 @@ public abstract class EntityLiving extends Entity { return EnumMonsterType.UNDEFINED; } - public abstract ItemStack bd(); + public abstract ItemStack be(); public abstract ItemStack getEquipment(int i); @@ -1130,15 +1130,15 @@ public abstract class EntityLiving extends Entity { public abstract ItemStack[] getEquipment(); - protected float be() { + protected float bf() { return 1.0F; } - protected float bf() { + protected float bg() { return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F; } - protected boolean bg() { + protected boolean bh() { return this.getHealth() <= 0.0F; } @@ -1178,7 +1178,7 @@ public abstract class EntityLiving extends Entity { this.enderTeleportTo(d0, d1, d2); } - protected void bi() { + protected void bj() { this.motY = 0.41999998688697815D; if (this.hasEffect(MobEffectList.JUMP)) { this.motY += (double) ((float) (this.getEffect(MobEffectList.JUMP).getAmplifier() + 1) * 0.1F); @@ -1197,9 +1197,9 @@ public abstract class EntityLiving extends Entity { public void e(float f, float f1) { double d0; - if (this.L() && (!(this instanceof EntityHuman) || !((EntityHuman) this).abilities.isFlying)) { + if (this.M() && (!(this instanceof EntityHuman) || !((EntityHuman) this).abilities.isFlying)) { d0 = this.locY; - this.a(f, f1, this.bj() ? 0.04F : 0.02F); + this.a(f, f1, this.bk() ? 0.04F : 0.02F); this.move(this.motX, this.motY, this.motZ); this.motX *= 0.800000011920929D; this.motY *= 0.800000011920929D; @@ -1208,7 +1208,7 @@ public abstract class EntityLiving extends Entity { if (this.positionChanged && this.c(this.motX, this.motY + 0.6000000238418579D - this.locY + d0, this.motZ)) { this.motY = 0.30000001192092896D; } - } else if (this.O() && (!(this instanceof EntityHuman) || !((EntityHuman) this).abilities.isFlying)) { + } else if (this.P() && (!(this instanceof EntityHuman) || !((EntityHuman) this).abilities.isFlying)) { d0 = this.locY; this.a(f, f1, 0.02F); this.move(this.motX, this.motY, this.motZ); @@ -1230,7 +1230,7 @@ public abstract class EntityLiving extends Entity { float f4; if (this.onGround) { - f4 = this.bk() * f3; + f4 = this.bl() * f3; } else { f4 = this.aQ; } @@ -1305,12 +1305,12 @@ public abstract class EntityLiving extends Entity { this.aG += this.aF; } - protected boolean bj() { + protected boolean bk() { return false; } - public float bk() { - return this.bj() ? this.bp : 0.1F; + public float bl() { + return this.bk() ? this.bp : 0.1F; } public void i(float f) { @@ -1329,7 +1329,7 @@ public abstract class EntityLiving extends Entity { public void h() { super.h(); if (!this.world.isStatic) { - int i = this.aY(); + int i = this.aZ(); if (i > 0) { if (this.av <= 0) { @@ -1361,7 +1361,7 @@ public abstract class EntityLiving extends Entity { } if (this.ticksLived % 20 == 0) { - this.aV().g(); + this.aW().g(); } } @@ -1475,7 +1475,7 @@ public abstract class EntityLiving extends Entity { --this.bg; this.setPosition(d0, d1, d2); this.b(this.yaw, this.pitch); - } else if (!this.bq()) { + } else if (!this.br()) { this.motX *= 0.98D; this.motY *= 0.98D; this.motZ *= 0.98D; @@ -1494,19 +1494,19 @@ public abstract class EntityLiving extends Entity { } this.world.methodProfiler.a("ai"); - if (this.bg()) { + if (this.bh()) { this.bc = false; this.bd = 0.0F; this.be = 0.0F; this.bf = 0.0F; - } else if (this.bq()) { - if (this.bj()) { + } else if (this.br()) { + if (this.bk()) { this.world.methodProfiler.a("newAi"); - this.bm(); + this.bn(); this.world.methodProfiler.b(); } else { this.world.methodProfiler.a("oldAi"); - this.bp(); + this.bq(); this.world.methodProfiler.b(); this.aO = this.yaw; } @@ -1515,9 +1515,9 @@ public abstract class EntityLiving extends Entity { this.world.methodProfiler.b(); this.world.methodProfiler.a("jump"); if (this.bc) { - if (!this.L() && !this.O()) { + if (!this.M() && !this.P()) { if (this.onGround && this.bq == 0) { - this.bi(); + this.bj(); this.bq = 10; } } else { @@ -1536,15 +1536,15 @@ public abstract class EntityLiving extends Entity { this.world.methodProfiler.b(); this.world.methodProfiler.a("push"); if (!this.world.isStatic) { - this.bn(); + this.bo(); } this.world.methodProfiler.b(); } - protected void bm() {} + protected void bn() {} - protected void bn() { + protected void bo() { List list = this.world.getEntities(this, this.boundingBox.grow(0.20000000298023224D, 0.0D, 0.20000000298023224D)); if (list != null && !list.isEmpty()) { @@ -1558,7 +1558,7 @@ public abstract class EntityLiving extends Entity { } // CraftBukkit end - if (entity.R()) { + if (entity.S()) { this.o(entity); } } @@ -1569,16 +1569,16 @@ public abstract class EntityLiving extends Entity { entity.collide(this); } - public void aa() { - super.aa(); + public void ab() { + super.ab(); this.aV = this.aW; this.aW = 0.0F; this.fallDistance = 0.0F; } - protected void bo() {} + protected void bp() {} - protected void bp() { + protected void bq() { ++this.aU; } @@ -1604,11 +1604,11 @@ public abstract class EntityLiving extends Entity { } } - public boolean p(Entity entity) { + public boolean hasLineOfSight(Entity entity) { return this.world.a(Vec3D.a(this.locX, this.locY + (double) this.getHeadHeight(), this.locZ), Vec3D.a(entity.locX, entity.locY + (double) entity.getHeadHeight(), entity.locZ)) == null; } - public Vec3D af() { + public Vec3D ag() { return this.j(1.0F); } @@ -1636,15 +1636,15 @@ public abstract class EntityLiving extends Entity { } } - public boolean bq() { + public boolean br() { return !this.world.isStatic; } - public boolean Q() { + public boolean R() { return !this.dead; } - public boolean R() { + public boolean S() { return !this.dead; } @@ -1652,7 +1652,7 @@ public abstract class EntityLiving extends Entity { return this.length * 0.85F; } - protected void P() { + protected void Q() { this.velocityChanged = this.random.nextDouble() >= this.getAttributeInstance(GenericAttributes.c).getValue(); } @@ -1660,11 +1660,11 @@ public abstract class EntityLiving extends Entity { return this.aO; } - public float br() { + public float getAbsorptionHearts() { return this.br; } - public void m(float f) { + public void setAbsorptionHearts(float f) { if (f < 0.0F) { f = 0.0F; } @@ -1684,7 +1684,7 @@ public abstract class EntityLiving extends Entity { return this.getScoreboardTeam() != null ? this.getScoreboardTeam().isAlly(scoreboardteambase) : false; } - public void bt() {} - public void bu() {} + + public void bv() {} } |