diff options
author | Erik Broes <erikbroes@grum.nl> | 2011-04-20 22:47:26 +0200 |
---|---|---|
committer | EvilSeph <evilseph@unaligned.org> | 2011-04-21 04:25:46 -0400 |
commit | a6c8a36dcea9c976d8b48f8b942608248db8cb4f (patch) | |
tree | 9b4039d8f0a9969abf5110a94d75925c4ad52524 /src/main/java/net/minecraft/server/EntityBoat.java | |
parent | 2fd3f8d299fdee827de90a999c5a4c9fd6eefeb9 (diff) | |
download | craftbukkit-a6c8a36dcea9c976d8b48f8b942608248db8cb4f.tar craftbukkit-a6c8a36dcea9c976d8b48f8b942608248db8cb4f.tar.gz craftbukkit-a6c8a36dcea9c976d8b48f8b942608248db8cb4f.tar.lz craftbukkit-a6c8a36dcea9c976d8b48f8b942608248db8cb4f.tar.xz craftbukkit-a6c8a36dcea9c976d8b48f8b942608248db8cb4f.zip |
Update for 1.5_02.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityBoat.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityBoat.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java index 365c0a80..26b16fa8 100644 --- a/src/main/java/net/minecraft/server/EntityBoat.java +++ b/src/main/java/net/minecraft/server/EntityBoat.java @@ -53,26 +53,26 @@ public class EntityBoat extends Entity { this.damage = 0; this.b = 0; this.c = 1; - this.aD = true; + this.aE = true; this.b(1.5F, 0.6F); this.height = this.width / 2.0F; } - protected boolean l() { + protected boolean n() { return false; } - protected void a() {} + protected void b() {} public AxisAlignedBB a_(Entity entity) { return entity.boundingBox; } - public AxisAlignedBB d() { + public AxisAlignedBB e_() { return this.boundingBox; } - public boolean e_() { + public boolean d_() { return true; } @@ -94,7 +94,7 @@ public class EntityBoat extends Entity { // CraftBukkit end } - public double k() { + public double m() { return (double) this.width * 0.0D - 0.30000001192092896D; } @@ -116,7 +116,7 @@ public class EntityBoat extends Entity { this.c = -this.c; this.b = 10; this.damage += i * 10; - this.W(); + this.ab(); if (this.damage > 40) { // CraftBukkit start @@ -148,11 +148,11 @@ public class EntityBoat extends Entity { } } - public boolean d_() { + public boolean o_() { return !this.dead; } - public void f_() { + public void p_() { // CraftBukkit start double prevX = this.locX; double prevY = this.locY; @@ -161,7 +161,7 @@ public class EntityBoat extends Entity { float prevPitch = this.pitch; // CraftBukkit end - super.f_(); + super.p_(); if (this.b > 0) { --this.b; } @@ -354,7 +354,7 @@ public class EntityBoat extends Entity { for (int l = 0; l < list.size(); ++l) { Entity entity = (Entity) list.get(l); - if (entity != this.passenger && entity.e_() && entity instanceof EntityBoat) { + if (entity != this.passenger && entity.d_() && entity instanceof EntityBoat) { entity.collide(this); } } @@ -366,19 +366,19 @@ public class EntityBoat extends Entity { } } - public void h_() { + public void f() { if (this.passenger != null) { double d0 = Math.cos((double) this.yaw * 3.141592653589793D / 180.0D) * 0.4D; double d1 = Math.sin((double) this.yaw * 3.141592653589793D / 180.0D) * 0.4D; - this.passenger.setPosition(this.locX + d0, this.locY + this.k() + this.passenger.C(), this.locZ + d1); + this.passenger.setPosition(this.locX + d0, this.locY + this.m() + this.passenger.F(), this.locZ + d1); } } - protected void a(NBTTagCompound nbttagcompound) {} - protected void b(NBTTagCompound nbttagcompound) {} + protected void a(NBTTagCompound nbttagcompound) {} + public boolean a(EntityHuman entityhuman) { if (this.passenger != null && this.passenger instanceof EntityHuman && this.passenger != entityhuman) { return true; |