Update CraftBukkit to 1.6.1

This commit is contained in:
Nate Mortensen
2013-07-01 06:03:00 -05:00
committed by Wesley Wolfe
parent f887b76a25
commit 6c09066e22
228 changed files with 6426 additions and 5442 deletions

View File

@@ -2,38 +2,38 @@ package net.minecraft.server;
public class ControllerMove {
private EntityLiving a;
private EntityInsentient a;
private double b;
private double c;
private double d;
private float e;
private boolean f = false;
private double e;
private boolean f;
public ControllerMove(EntityLiving entityliving) {
this.a = entityliving;
this.b = entityliving.locX;
this.c = entityliving.locY;
this.d = entityliving.locZ;
public ControllerMove(EntityInsentient entityinsentient) {
this.a = entityinsentient;
this.b = entityinsentient.locX;
this.c = entityinsentient.locY;
this.d = entityinsentient.locZ;
}
public boolean a() {
return this.f;
}
public float b() {
public double b() {
return this.e;
}
public void a(double d0, double d1, double d2, float f) {
public void a(double d0, double d1, double d2, double d3) {
this.b = d0;
this.c = d1;
this.d = d2;
this.e = f;
this.e = d3;
this.f = true;
}
public void c() {
this.a.f(0.0F);
this.a.n(0.0F);
if (this.f) {
this.f = false;
int i = MathHelper.floor(this.a.boundingBox.b + 0.5D);
@@ -47,7 +47,7 @@ public class ControllerMove {
float f = (float) (org.bukkit.craftbukkit.TrigMath.atan2(d1, d0) * 180.0D / 3.1415927410125732D) - 90.0F;
this.a.yaw = this.a(this.a.yaw, f, 30.0F);
this.a.e(this.e * this.a.bE());
this.a.i((float) (this.e * this.a.a(GenericAttributes.d).e()));
if (d2 > 0.0D && d0 * d0 + d1 * d1 < 1.0D) {
this.a.getControllerJump().a();
}