summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityCreature.java
diff options
context:
space:
mode:
authorNathan Adams <dinnerbone@dinnerbone.com>2012-03-22 20:39:39 +0000
committerNathan Adams <dinnerbone@dinnerbone.com>2012-03-22 20:39:39 +0000
commit9d09e7d0167326d4169f734e4b6d04c54d767507 (patch)
tree898333912891b9c35a63994242fbd55d5b6ac2c6 /src/main/java/net/minecraft/server/EntityCreature.java
parent8dc7417a3d5c1af1e6434dc54952cfd5a8e90688 (diff)
downloadcraftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar
craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.gz
craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.lz
craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.xz
craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.zip
Updated to Minecraft version 1.2.4. Updated version string to 1.2.4-R0.1.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityCreature.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityCreature.java22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
index b865cbd5..741e755e 100644
--- a/src/main/java/net/minecraft/server/EntityCreature.java
+++ b/src/main/java/net/minecraft/server/EntityCreature.java
@@ -17,7 +17,7 @@ public abstract class EntityCreature extends EntityLiving {
super(world);
}
- protected boolean E() {
+ protected boolean F() {
return false;
}
@@ -27,7 +27,7 @@ public abstract class EntityCreature extends EntityLiving {
--this.f;
}
- this.e = this.E();
+ this.e = this.F();
float f = 16.0F;
if (this.target == null) {
@@ -77,12 +77,12 @@ public abstract class EntityCreature extends EntityLiving {
if (!this.e && 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.e && (this.pathEntity == null && this.random.nextInt(180) == 0 || this.random.nextInt(120) == 0 || this.f > 0) && this.aV < 100) {
- this.F();
+ this.G();
}
int i = MathHelper.floor(this.boundingBox.b + 0.5D);
- boolean flag = this.aT();
- boolean flag1 = this.aU();
+ boolean flag = this.aU();
+ boolean flag1 = this.aV();
this.pitch = 0.0F;
if (this.pathEntity != null && this.random.nextInt(100) != 0) {
@@ -146,7 +146,7 @@ public abstract class EntityCreature extends EntityLiving {
this.a(this.target, 30.0F, 30.0F);
}
- if (this.positionChanged && !this.G()) {
+ if (this.positionChanged && !this.H()) {
this.aZ = true;
}
@@ -161,7 +161,7 @@ public abstract class EntityCreature extends EntityLiving {
}
}
- protected void F() {
+ protected void G() {
// MethodProfiler.a("stroll"); // CraftBukkit - not in production code
boolean flag = false;
int i = -1;
@@ -211,7 +211,7 @@ public abstract class EntityCreature extends EntityLiving {
return super.canSpawn() && this.a(i, j, k) >= 0.0F;
}
- public boolean G() {
+ public boolean H() {
return this.pathEntity != null;
}
@@ -219,7 +219,7 @@ public abstract class EntityCreature extends EntityLiving {
this.pathEntity = pathentity;
}
- public Entity H() {
+ public Entity I() {
return this.target;
}
@@ -227,11 +227,11 @@ public abstract class EntityCreature extends EntityLiving {
this.target = entity;
}
- protected float D_() {
+ protected float J() {
if (this.c_()) {
return 1.0F;
} else {
- float f = super.D_();
+ float f = super.J();
if (this.f > 0) {
f *= 2.0F;