Updated to Minecraft version 1.2.4. Updated version string to 1.2.4-R0.1.

This commit is contained in:
Nathan Adams
2012-03-22 20:39:39 +00:00
parent 8dc7417a3d
commit 9d09e7d016
94 changed files with 647 additions and 1944 deletions

View File

@@ -110,7 +110,7 @@ public class EntityBoat extends Entity {
this.d(-this.m());
this.c(10);
this.setDamage(this.getDamage() + i * 10);
this.aV();
this.aW();
if (this.getDamage() > 40) {
// CraftBukkit start
List<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
@@ -168,7 +168,7 @@ public class EntityBoat extends Entity {
return !this.dead;
}
public void G_() {
public void F_() {
// CraftBukkit start
double prevX = this.locX;
double prevY = this.locY;
@@ -177,7 +177,7 @@ public class EntityBoat extends Entity {
float prevPitch = this.pitch;
// CraftBukkit end
super.G_();
super.F_();
if (this.l() > 0) {
this.c(this.l() - 1);
}
@@ -443,7 +443,7 @@ public class EntityBoat extends Entity {
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.x_() + this.passenger.V(), this.locZ + d1);
this.passenger.setPosition(this.locX + d0, this.locY + this.x_() + this.passenger.W(), this.locZ + d1);
}
}