diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-01 10:49:23 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-01 14:38:31 +0000 |
commit | 543c4879fee3b7165764c5371d226c93fe3a657b (patch) | |
tree | 4fe9116464e1fe42a40dc3ba19b58234bd26f821 /src/main/java/net/minecraft/server/Entity.java | |
parent | e9ca87000c1794715bc3fe0a7d1caaf809057635 (diff) | |
download | craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.gz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.lz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.xz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.zip |
Updated CraftBukkit to 1.2
Diffstat (limited to 'src/main/java/net/minecraft/server/Entity.java')
-rw-r--r-- | src/main/java/net/minecraft/server/Entity.java | 110 |
1 files changed, 59 insertions, 51 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 3638f861..bc093075 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -191,11 +191,11 @@ public abstract class Entity { this.boundingBox.c(d0 - (double) f, d1 - (double) this.height + (double) this.bO, d2 - (double) f, d0 + (double) f, d1 - (double) this.height + (double) this.bO + (double) f1, d2 + (double) f); } - public void y_() { - this.am(); + public void G_() { + this.az(); } - public void am() { + public void az() { // MethodProfiler.a("entityBaseTick"); // CraftBukkit - not in production code if (this.vehicle != null && this.vehicle.dead) { this.vehicle = null; @@ -210,7 +210,7 @@ public abstract class Entity { this.lastYaw = this.yaw; int i; - if (this.isSprinting()) { + if (this.isSprinting() && !this.aT()) { int j = MathHelper.floor(this.locX); int k = MathHelper.floor(this.locY - 0.20000000298023224D - (double) this.height); @@ -222,7 +222,7 @@ public abstract class Entity { } } - if (this.i_()) { + if (this.h_()) { if (!this.bV && !this.justCreated) { float f = MathHelper.sqrt(this.motX * this.motX * 0.20000000298023224D + this.motY * this.motY + this.motZ * this.motZ * 0.20000000298023224D) * 0.2F; @@ -284,13 +284,13 @@ public abstract class Entity { } } - if (this.aL()) { - this.aG(); + if (this.aU()) { + this.aP(); this.fallDistance *= 0.5F; } if (this.locY < -64.0D) { - this.az(); + this.aH(); } if (!this.world.isStatic) { @@ -302,7 +302,7 @@ public abstract class Entity { // MethodProfiler.a(); // CraftBukkit - not in production code } - protected void aG() { + protected void aP() { if (!this.fireProof) { // CraftBukkit start - fallen in lava TODO: this event spams! if (this instanceof EntityLiving) { @@ -352,7 +352,7 @@ public abstract class Entity { this.fireTicks = 0; } - protected void az() { + protected void aH() { this.die(); } @@ -389,7 +389,7 @@ public abstract class Entity { double d6 = d1; double d7 = d2; AxisAlignedBB axisalignedbb = this.boundingBox.clone(); - boolean flag = this.onGround && this.isSneaking(); + boolean flag = this.onGround && this.isSneaking() && this instanceof EntityHuman; if (flag) { double d8; @@ -618,7 +618,7 @@ public abstract class Entity { } } - boolean flag2 = this.aJ(); + boolean flag2 = this.aS(); if (this.world.d(this.boundingBox.shrink(0.0010D, 0.0010D, 0.0010D))) { this.burn(1); @@ -683,7 +683,7 @@ public abstract class Entity { } } - this.b(this.fallDistance); + this.a(this.fallDistance); this.fallDistance = 0.0F; } } else if (d0 < 0.0D) { @@ -691,7 +691,7 @@ public abstract class Entity { } } - public AxisAlignedBB h_() { + public AxisAlignedBB h() { return null; } @@ -717,21 +717,21 @@ public abstract class Entity { return this.fireProof; } - protected void b(float f) { + protected void a(float f) { if (this.passenger != null) { - this.passenger.b(f); + this.passenger.a(f); } } - public boolean aJ() { - return this.bV || this.world.v(MathHelper.floor(this.locX), MathHelper.floor(this.locY), MathHelper.floor(this.locZ)); + public boolean aS() { + return this.bV || this.world.y(MathHelper.floor(this.locX), MathHelper.floor(this.locY), MathHelper.floor(this.locZ)); } - public boolean aK() { + public boolean aT() { return this.bV; } - public boolean i_() { + public boolean h_() { return this.world.a(this.boundingBox.grow(0.0D, -0.4000000059604645D, 0.0D).shrink(0.0010D, 0.0010D, 0.0010D), Material.WATER, this); } @@ -756,7 +756,7 @@ public abstract class Entity { return 0.0F; } - public boolean aL() { + public boolean aU() { return this.world.a(this.boundingBox.grow(-0.10000000149011612D, -0.4000000059604645D, -0.10000000149011612D), Material.LAVA); } @@ -779,15 +779,15 @@ public abstract class Entity { } } - public float a(float f) { + public float b(float f) { int i = MathHelper.floor(this.locX); int j = MathHelper.floor(this.locZ); - if (this.world.isLoaded(i, this.world.height / 2, j)) { + if (this.world.isLoaded(i, 0, j)) { double d0 = (this.boundingBox.e - this.boundingBox.b) * 0.66D; int k = MathHelper.floor(this.locY - (double) this.height + d0); - return this.world.m(i, k, j); + return this.world.p(i, k, j); } else { return 0.0F; } @@ -834,7 +834,7 @@ public abstract class Entity { this.setPosition(this.locX, this.locY, this.locZ); } - public float h(Entity entity) { + public float i(Entity entity) { float f = (float) (this.locX - entity.locX); float f1 = (float) (this.locY - entity.locY); float f2 = (float) (this.locZ - entity.locZ); @@ -858,7 +858,7 @@ public abstract class Entity { return (double) MathHelper.sqrt(d3 * d3 + d4 * d4 + d5 * d5); } - public double i(Entity entity) { + public double j(Entity entity) { double d0 = this.locX - entity.locX; double d1 = this.locY - entity.locY; double d2 = this.locZ - entity.locZ; @@ -903,27 +903,27 @@ public abstract class Entity { this.ce = true; } - protected void aM() { + protected void aV() { this.velocityChanged = true; } public boolean damageEntity(DamageSource damagesource, int i) { - this.aM(); + this.aV(); return false; } - public boolean e_() { + public boolean o_() { return false; } - public boolean f_() { + public boolean e_() { return false; } public void b(Entity entity, int i) {} public boolean c(NBTTagCompound nbttagcompound) { - String s = this.aN(); + String s = this.aW(); if (!this.dead && s != null) { nbttagcompound.setString("id", s); @@ -1048,7 +1048,7 @@ public abstract class Entity { // CraftBukkit end } - protected final String aN() { + protected final String aW() { return EntityTypes.b(this); } @@ -1125,20 +1125,20 @@ public abstract class Entity { return false; } - public AxisAlignedBB a_(Entity entity) { + public AxisAlignedBB b_(Entity entity) { return null; } - public void N() { + public void Q() { if (this.vehicle.dead) { this.vehicle = null; } else { this.motX = 0.0D; this.motY = 0.0D; this.motZ = 0.0D; - this.y_(); + this.G_(); if (this.vehicle != null) { - this.vehicle.i(); + this.vehicle.i_(); this.f += (double) (this.vehicle.yaw - this.vehicle.lastYaw); for (this.e += (double) (this.vehicle.pitch - this.vehicle.lastPitch); this.f >= 180.0D; this.f -= 360.0D) { @@ -1185,15 +1185,15 @@ public abstract class Entity { } } - public void i() { - this.passenger.setPosition(this.locX, this.locY + this.q() + this.passenger.S(), this.locZ); + public void i_() { + this.passenger.setPosition(this.locX, this.locY + this.x_() + this.passenger.V(), this.locZ); } - public double S() { + public double V() { return (double) this.height; } - public double q() { + public double x_() { return (double) this.length * 0.75D; } @@ -1274,22 +1274,22 @@ public abstract class Entity { return 0.1F; } - public Vec3D aA() { + public Vec3D aI() { return null; } - public void Y() {} + public void ac() {} public ItemStack[] getEquipment() { return null; } public boolean isBurning() { - return this.fireTicks > 0 || this.k(0); + return this.fireTicks > 0 || this.j(0); } public boolean isSneaking() { - return this.k(1); + return this.j(1); } public void setSneak(boolean flag) { @@ -1297,18 +1297,18 @@ public abstract class Entity { } public boolean isSprinting() { - return this.k(3); + return this.j(3); } public void setSprinting(boolean flag) { this.a(3, flag); } - public void h(boolean flag) { + public void i(boolean flag) { this.a(4, flag); } - protected boolean k(int i) { + protected boolean j(int i) { return (this.datawatcher.getByte(0) & 1 << i) != 0; } @@ -1367,7 +1367,7 @@ public abstract class Entity { } } - public void a(EntityLiving entityliving) {} + public void c(EntityLiving entityliving) {} protected boolean g(double d0, double d1, double d2) { int i = MathHelper.floor(d0); @@ -1449,7 +1449,7 @@ public abstract class Entity { } } - public void s() { + public void u() { this.bC = true; this.fallDistance = 0.0F; } @@ -1464,11 +1464,19 @@ public abstract class Entity { return LocaleI18n.get("entity." + s + ".name"); } - public Entity[] aR() { + public Entity[] ba() { return null; } - public boolean a(Entity entity) { + public boolean a_(Entity entity) { return this == entity; } + + public float aq() { + return 0.0F; + } + + public boolean k_() { + return true; + } } |