diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-06-29 23:02:25 +0100 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-06-30 15:19:25 +0100 |
commit | a679e7f38025924dba3dd688ccb87e92306c4c3e (patch) | |
tree | 604a20c893873bef01a92eaa09d9309f32b7e29c /src/main/java/net/minecraft/server/Entity.java | |
parent | a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3 (diff) | |
download | craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.gz craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.lz craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.xz craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.zip |
Update to Minecraft 1.7
Diffstat (limited to 'src/main/java/net/minecraft/server/Entity.java')
-rw-r--r-- | src/main/java/net/minecraft/server/Entity.java | 96 |
1 files changed, 54 insertions, 42 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 42c598ae..4edecff6 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -76,13 +76,14 @@ public abstract class Entity { private boolean justCreated; protected boolean fireProof; protected DataWatcher datawatcher; + public float bF; private double d; private double e; - public boolean bF; - public int bG; + public boolean bG; public int bH; public int bI; - public boolean bJ; + public int bJ; + public boolean bK; public UUID uniqueId = UUID.randomUUID(); // CraftBukkit public Entity(World world) { @@ -117,7 +118,8 @@ public abstract class Entity { this.justCreated = true; this.fireProof = false; this.datawatcher = new DataWatcher(); - this.bF = false; + this.bF = 0.0F; + this.bG = false; this.world = world; this.setPosition(0.0D, 0.0D, 0.0D); this.datawatcher.a(0, Byte.valueOf((byte) 0)); @@ -126,7 +128,7 @@ public abstract class Entity { protected abstract void b(); - public DataWatcher Z() { + public DataWatcher aa() { return this.datawatcher; } @@ -195,11 +197,11 @@ public abstract class Entity { this.boundingBox.c(d0 - (double) f, d1 - (double) this.height + (double) this.br, d2 - (double) f, d0 + (double) f, d1 - (double) this.height + (double) this.br + (double) f1, d2 + (double) f); } - public void o_() { - this.Q(); + public void m_() { + this.R(); } - public void Q() { + public void R() { if (this.vehicle != null && this.vehicle.dead) { this.vehicle = null; } @@ -274,12 +276,12 @@ public abstract class Entity { } } - if (this.ad()) { - this.aa(); + if (this.ae()) { + this.ab(); } if (this.locY < -64.0D) { - this.X(); + this.Y(); } if (!this.world.isStatic) { @@ -290,7 +292,7 @@ public abstract class Entity { this.justCreated = false; } - protected void aa() { + protected void ab() { if (!this.fireProof) { // CraftBukkit start - TODO: this event spams! if (this instanceof EntityLiving) { @@ -328,7 +330,7 @@ public abstract class Entity { } } - protected void X() { + protected void Y() { this.die(); } @@ -599,7 +601,7 @@ public abstract class Entity { } } - boolean flag2 = this.ab(); + boolean flag2 = this.ac(); if (this.world.d(this.boundingBox.shrink(0.0010D, 0.0010D, 0.0010D))) { this.burn(1); @@ -672,11 +674,11 @@ public abstract class Entity { } } - public boolean ab() { + public boolean ac() { return this.bA || this.world.s(MathHelper.floor(this.locX), MathHelper.floor(this.locY), MathHelper.floor(this.locZ)); } - public boolean ac() { + public boolean ad() { return this.bA; } @@ -685,7 +687,7 @@ public abstract class Entity { } public boolean a(Material material) { - double d0 = this.locY + (double) this.s(); + double d0 = this.locY + (double) this.t(); int i = MathHelper.floor(this.locX); int j = MathHelper.d((float) MathHelper.floor(d0)); int k = MathHelper.floor(this.locZ); @@ -701,11 +703,11 @@ public abstract class Entity { } } - public float s() { + public float t() { return 0.0F; } - public boolean ad() { + public boolean ae() { return this.world.a(this.boundingBox.b(-0.10000000149011612D, -0.4000000059604645D, -0.10000000149011612D), Material.LAVA); } @@ -734,7 +736,17 @@ public abstract class Entity { int j = MathHelper.floor(this.locY - (double) this.height + d0); int k = MathHelper.floor(this.locZ); - return this.world.a(MathHelper.floor(this.boundingBox.a), MathHelper.floor(this.boundingBox.b), MathHelper.floor(this.boundingBox.c), MathHelper.floor(this.boundingBox.d), MathHelper.floor(this.boundingBox.e), MathHelper.floor(this.boundingBox.f)) ? this.world.m(i, j, k) : 0.0F; + if (this.world.a(MathHelper.floor(this.boundingBox.a), MathHelper.floor(this.boundingBox.b), MathHelper.floor(this.boundingBox.c), MathHelper.floor(this.boundingBox.d), MathHelper.floor(this.boundingBox.e), MathHelper.floor(this.boundingBox.f))) { + float f1 = this.world.n(i, j, k); + + if (f1 < this.bF) { + f1 = this.bF; + } + + return f1; + } else { + return this.bF; + } } public void spawnIn(World world) { @@ -846,16 +858,16 @@ public abstract class Entity { this.motZ += d2; } - protected void ae() { + protected void af() { this.velocityChanged = true; } public boolean damageEntity(Entity entity, int i) { - this.ae(); + this.af(); return false; } - public boolean n_() { + public boolean l_() { return false; } @@ -866,7 +878,7 @@ public abstract class Entity { public void c(Entity entity, int i) {} public boolean c(NBTTagCompound nbttagcompound) { - String s = this.af(); + String s = this.ag(); if (!this.dead && s != null) { nbttagcompound.setString("id", s); @@ -987,7 +999,7 @@ public abstract class Entity { // CraftBukkit end } - protected final String af() { + protected final String ag() { return EntityTypes.b(this); } @@ -1039,20 +1051,20 @@ public abstract class Entity { return entityitem; } - public boolean S() { + public boolean T() { return !this.dead; } - public boolean J() { + public boolean K() { for (int i = 0; i < 8; ++i) { float f = ((float) ((i >> 0) % 2) - 0.5F) * this.length * 0.9F; float f1 = ((float) ((i >> 1) % 2) - 0.5F) * 0.1F; float f2 = ((float) ((i >> 2) % 2) - 0.5F) * this.length * 0.9F; int j = MathHelper.floor(this.locX + (double) f); - int k = MathHelper.floor(this.locY + (double) this.s() + (double) f1); + int k = MathHelper.floor(this.locY + (double) this.t() + (double) f1); int l = MathHelper.floor(this.locZ + (double) f2); - if (this.world.d(j, k, l)) { + if (this.world.e(j, k, l)) { return true; } } @@ -1068,14 +1080,14 @@ public abstract class Entity { return null; } - public void D() { + public void E() { if (this.vehicle.dead) { this.vehicle = null; } else { this.motX = 0.0D; this.motY = 0.0D; this.motZ = 0.0D; - this.o_(); + this.m_(); if (this.vehicle != null) { this.vehicle.f(); this.e += (double) (this.vehicle.yaw - this.vehicle.lastYaw); @@ -1125,10 +1137,10 @@ public abstract class Entity { } public void f() { - this.passenger.setPosition(this.locX, this.locY + this.m() + this.passenger.H(), this.locZ); + this.passenger.setPosition(this.locX, this.locY + this.m() + this.passenger.I(), this.locZ); } - public double H() { + public double I() { return (double) this.height; } @@ -1196,11 +1208,11 @@ public abstract class Entity { } } - public Vec3D Y() { + public Vec3D Z() { return null; } - public void O() {} + public void P() {} public ItemStack[] getEquipment() { return null; @@ -1256,13 +1268,13 @@ public abstract class Entity { double d4 = d1 - (double) j; double d5 = d2 - (double) k; - if (this.world.d(i, j, k)) { - boolean flag = !this.world.d(i - 1, j, k); - boolean flag1 = !this.world.d(i + 1, j, k); - boolean flag2 = !this.world.d(i, j - 1, k); - boolean flag3 = !this.world.d(i, j + 1, k); - boolean flag4 = !this.world.d(i, j, k - 1); - boolean flag5 = !this.world.d(i, j, k + 1); + if (this.world.e(i, j, k)) { + boolean flag = !this.world.e(i - 1, j, k); + boolean flag1 = !this.world.e(i + 1, j, k); + boolean flag2 = !this.world.e(i, j - 1, k); + boolean flag3 = !this.world.e(i, j + 1, k); + boolean flag4 = !this.world.e(i, j, k - 1); + boolean flag5 = !this.world.e(i, j, k + 1); byte b0 = -1; double d6 = 9999.0D; |