twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-16 20:53:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update for 1.6.5

Browse Source
This commit is contained in:
Erik Broes
2011-05-28 22:50:08 +02:00
committed by EvilSeph
parent 9ec5d8b5df
commit 6dbd710bbf
41 changed files with 747 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/minecraft/server/EntityBoat.java
View File

@@ -53,7 +53,7 @@ public class EntityBoat extends Entity {
this.damage = 0;
this.b = 0;
this.c = 1;
this.aH = true;
this.aI = true;
this.b(1.5F, 0.6F);
this.height = this.width / 2.0F;
}
@@ -116,7 +116,7 @@ public class EntityBoat extends Entity {
this.c = -this.c;
this.b = 10;
this.damage += i * 10;
this.ac();
this.ae();
if (this.damage > 40) {
// CraftBukkit start
@@ -148,11 +148,11 @@ public class EntityBoat extends Entity {
}
}
public boolean o_() {
public boolean n_() {
return !this.dead;
}
public void p_() {
public void o_() {
// 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.p_();
super.o_();
if (this.b > 0) {
--this.b;
}
@@ -385,7 +385,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.m() + this.passenger.F(), this.locZ + d1);
this.passenger.setPosition(this.locX + d0, this.locY + this.m() + this.passenger.H(), this.locZ + d1);
}
}