twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-16 04:33:56 -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

14
src/main/java/net/minecraft/server/EntityMinecart.java
View File

@@ -51,7 +51,7 @@ public class EntityMinecart extends Entity implements IInventory {
this.b = 0;
this.c = 1;
this.i = false;
this.aH = true;
this.aI = true;
this.b(0.98F, 0.7F);
this.height = this.width / 2.0F;
}
@@ -117,7 +117,7 @@ public class EntityMinecart extends Entity implements IInventory {
this.c = -this.c;
this.b = 10;
this.ac();
this.ae();
this.damage += i * 10;
if (this.damage > 40) {
if (this.passenger != null) {
@@ -178,7 +178,7 @@ public class EntityMinecart extends Entity implements IInventory {
}
}
public boolean o_() {
public boolean n_() {
return !this.dead;
}
@@ -213,7 +213,7 @@ public class EntityMinecart extends Entity implements IInventory {
super.die();
}
public void p_() {
public void o_() {
// CraftBukkit start
double prevX = this.locX;
double prevY = this.locY;
@@ -741,7 +741,7 @@ public class EntityMinecart extends Entity implements IInventory {
double d2 = d0 * d0 + d1 * d1;
// CraftBukkit - Collision
if (d2 >= 9.9999997473787516E-005D && !collisionEvent.isCollisionCancelled()) {
if (d2 >= 9.999999747378752E-5D && !collisionEvent.isCollisionCancelled()) {
d2 = (double) MathHelper.a(d2);
d0 /= d2;
d1 /= d2;
@@ -755,8 +755,8 @@ public class EntityMinecart extends Entity implements IInventory {
d1 *= d3;
d0 *= 0.10000000149011612D;
d1 *= 0.10000000149011612D;
d0 *= (double) (1.0F - this.bt);
d1 *= (double) (1.0F - this.bt);
d0 *= (double) (1.0F - this.bu);
d1 *= (double) (1.0F - this.bu);
d0 *= 0.5D;
d1 *= 0.5D;
if (entity instanceof EntityMinecart) {