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

Update to Minecraft 1.7

Browse Source
This commit is contained in:
Dinnerbone
2011-06-29 23:02:25 +01:00
parent a98c7ba2c7
commit a679e7f380
67 changed files with 829 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,7 @@ public class EntityMinecart extends Entity implements IInventory {
this.c = -this.c;
this.b = 10;
this.ae();
this.af();
this.damage += i * 10;
if (this.damage > 40) {
if (this.passenger != null) {
@@ -175,7 +175,7 @@ public class EntityMinecart extends Entity implements IInventory {
}
}
public boolean n_() {
public boolean l_() {
return !this.dead;
}
@@ -210,7 +210,7 @@ public class EntityMinecart extends Entity implements IInventory {
super.die();
}
public void o_() {
public void m_() {
// CraftBukkit start
double prevX = this.locX;
double prevY = this.locY;
@@ -476,15 +476,15 @@ public class EntityMinecart extends Entity implements IInventory {
this.motX += this.motX / d20 * d21;
this.motZ += this.motZ / d20 * d21;
} else if (i1 == 1) {
if (this.world.d(i - 1, j, k)) {
if (this.world.e(i - 1, j, k)) {
this.motX = 0.02D;
} else if (this.world.d(i + 1, j, k)) {
} else if (this.world.e(i + 1, j, k)) {
this.motX = -0.02D;
}
} else if (i1 == 0) {
if (this.world.d(i, j, k - 1)) {
if (this.world.e(i, j, k - 1)) {
this.motZ = 0.02D;
} else if (this.world.d(i, j, k + 1)) {
} else if (this.world.e(i, j, k + 1)) {
this.motZ = -0.02D;
}
}