diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2012-11-06 06:05:28 -0600 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2012-11-13 16:09:52 -0600 |
commit | 7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7 (patch) | |
tree | 843902ff94d82e86f40d7e0af1ac838fee859e75 /src/main/java/net/minecraft/server/EntityCreature.java | |
parent | a0c3b4f9d1b403fa64230f22b5dd3222181ba646 (diff) | |
download | craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar.gz craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar.lz craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar.xz craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.zip |
Update CraftBukkit to Minecraft 1.4.4.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityCreature.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityCreature.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java index 6c63f9c1..95ec5835 100644 --- a/src/main/java/net/minecraft/server/EntityCreature.java +++ b/src/main/java/net/minecraft/server/EntityCreature.java @@ -20,7 +20,7 @@ public abstract class EntityCreature extends EntityLiving { return false; } - protected void bk() { + protected void bn() { this.world.methodProfiler.a("ai"); if (this.c > 0) { --this.c; @@ -52,7 +52,7 @@ public abstract class EntityCreature extends EntityLiving { } else if (this.target.isAlive()) { float f1 = this.target.d((Entity) this); - if (this.m(this.target)) { + if (this.n(this.target)) { this.a(this.target, f1); } } else { @@ -73,7 +73,7 @@ public abstract class EntityCreature extends EntityLiving { this.world.methodProfiler.b(); if (!this.b && this.target != null && (this.pathEntity == null || this.random.nextInt(20) == 0)) { this.pathEntity = this.world.findPath(this, this.target, f, true, false, false, true); - } else if (!this.b && (this.pathEntity == null && this.random.nextInt(180) == 0 || this.random.nextInt(120) == 0 || this.c > 0) && this.bC < 100) { + } else if (!this.b && (this.pathEntity == null && this.random.nextInt(180) == 0 || this.random.nextInt(120) == 0 || this.c > 0) && this.bA < 100) { this.i(); } @@ -97,7 +97,7 @@ public abstract class EntityCreature extends EntityLiving { } } - this.bG = false; + this.bE = false; if (vec3d != null) { double d1 = vec3d.c - this.locX; double d2 = vec3d.e - this.locZ; @@ -106,7 +106,7 @@ public abstract class EntityCreature extends EntityLiving { float f2 = (float) (org.bukkit.craftbukkit.TrigMath.atan2(d2, d1) * 180.0D / 3.1415927410125732D) - 90.0F; float f3 = MathHelper.g(f2 - this.yaw); - this.bE = this.bI; + this.bC = this.bG; if (f3 > 30.0F) { f3 = 30.0F; } @@ -123,12 +123,12 @@ public abstract class EntityCreature extends EntityLiving { this.yaw = (float) (Math.atan2(d5, d4) * 180.0D / 3.1415927410125732D) - 90.0F; f3 = (f4 - this.yaw + 90.0F) * 3.1415927F / 180.0F; - this.bD = -MathHelper.sin(f3) * this.bE * 1.0F; - this.bE = MathHelper.cos(f3) * this.bE * 1.0F; + this.bB = -MathHelper.sin(f3) * this.bC * 1.0F; + this.bC = MathHelper.cos(f3) * this.bC * 1.0F; } if (d3 > 0.0D) { - this.bG = true; + this.bE = true; } } @@ -137,16 +137,16 @@ public abstract class EntityCreature extends EntityLiving { } if (this.positionChanged && !this.k()) { - this.bG = true; + this.bE = true; } if (this.random.nextFloat() < 0.8F && (flag || flag1)) { - this.bG = true; + this.bE = true; } this.world.methodProfiler.b(); } else { - super.bk(); + super.bn(); this.pathEntity = null; } } @@ -215,10 +215,10 @@ public abstract class EntityCreature extends EntityLiving { this.target = entity; } - public float by() { - float f = super.by(); + public float bB() { + float f = super.bB(); - if (this.c > 0 && !this.bb()) { + if (this.c > 0 && !this.be()) { f *= 2.0F; } |