diff options
author | feildmaster <admin@feildmaster.com> | 2013-01-17 03:28:44 -0600 |
---|---|---|
committer | feildmaster <admin@feildmaster.com> | 2013-01-17 03:50:24 -0600 |
commit | e59af9908b5c6418664a8676e9ef13d9c8edc90e (patch) | |
tree | e48bc62a3556af51cf375f587100019b79d814cc /src/main/java/net/minecraft/server/EntityLiving.java | |
parent | 315127782a86659d8ac353408ce385e0b8ee9ddb (diff) | |
download | craftbukkit-e59af9908b5c6418664a8676e9ef13d9c8edc90e.tar craftbukkit-e59af9908b5c6418664a8676e9ef13d9c8edc90e.tar.gz craftbukkit-e59af9908b5c6418664a8676e9ef13d9c8edc90e.tar.lz craftbukkit-e59af9908b5c6418664a8676e9ef13d9c8edc90e.tar.xz craftbukkit-e59af9908b5c6418664a8676e9ef13d9c8edc90e.zip |
Update CraftBukkit to Minecraft 1.4.7
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityLiving.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityLiving.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index 005b8617..7d2e633b 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -76,7 +76,7 @@ public abstract class EntityLiving extends Entity { private Navigation navigation; protected final PathfinderGoalSelector goalSelector; protected final PathfinderGoalSelector targetSelector; - private EntityLiving bN; + private EntityLiving goalTarget; private EntitySenses bO; private float bP; private ChunkCoordinates bQ = new ChunkCoordinates(0, 0, 0); @@ -87,7 +87,7 @@ public abstract class EntityLiving extends Entity { public boolean bq = false; public int br = 0; public boolean canPickUpLoot = false; // CraftBukkit - protected -> public - public boolean persistent = !this.bj(); // CraftBukkit - private -> public, change value + public boolean persistent = !this.isTypeNotPersistent(); // CraftBukkit - private -> public, change value protected int bt; protected double bu; protected double bv; @@ -196,12 +196,12 @@ public abstract class EntityLiving extends Entity { return false; } - public EntityLiving aG() { - return this.bN; + public EntityLiving getGoalTarget() { + return this.goalTarget; } - public void b(EntityLiving entityliving) { - this.bN = entityliving; + public void setGoalTarget(EntityLiving entityliving) { + this.goalTarget = entityliving; } public boolean a(Class oclass) { @@ -1187,7 +1187,7 @@ public abstract class EntityLiving extends Entity { nbttaglist = nbttagcompound.getList("Equipment"); for (i = 0; i < this.equipment.length; ++i) { - this.equipment[i] = ItemStack.a((NBTTagCompound) nbttaglist.get(i)); + this.equipment[i] = ItemStack.createStack((NBTTagCompound) nbttaglist.get(i)); } } @@ -1430,7 +1430,7 @@ public abstract class EntityLiving extends Entity { this.am = true; } - protected boolean bj() { + protected boolean isTypeNotPersistent() { return true; } @@ -1827,7 +1827,7 @@ public abstract class EntityLiving extends Entity { } public int as() { - if (this.aG() == null) { + if (this.getGoalTarget() == null) { return 3; } else { int i = (int) ((float) this.health - (float) this.maxHealth * 0.33F); // this.getMaxHealth() -> this.maxHealth |