twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-17 21:33:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.12-pre2

Browse Source
This commit is contained in:
md_5
2017-05-14 12:00:00 +10:00
parent 6e3cec8bc7
commit 5195487ec6
210 changed files with 2280 additions and 1974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nms-patches/EntityMinecartAbstract.patch
View File

@@ -53,7 +53,7 @@
+ // CraftBukkit end
this.e(-this.u());
this.d(10);
this.ap();
this.av();
@@ -108,6 +141,15 @@
boolean flag = damagesource.getEntity() instanceof EntityHuman && ((EntityHuman) damagesource.getEntity()).abilities.canInstantlyBuild;
@@ -67,13 +67,13 @@
+ return true;
+ }
+ // CraftBukkit end
this.az();
this.aF();
if (flag && !this.hasCustomName()) {
this.die();
@@ -146,6 +188,14 @@
}
public void A_() {
public void B_() {
+ // CraftBukkit start
+ double prevX = this.locX;
+ double prevY = this.locY;
@@ -87,13 +87,13 @@
}
@@ -166,7 +216,7 @@
i = this.V();
i = this.Z();
if (this.ak) {
- if (minecraftserver.getAllowNether()) {
+ if (true || minecraftserver.getAllowNether()) { // CraftBukkit - multi-world should still allow teleport even if default vanilla nether disabled
if (!this.isPassenger() && this.al++ >= i) {
this.al = i;
this.portalCooldown = this.aE();
this.portalCooldown = this.aK();
@@ -266,6 +316,18 @@
}
@@ -156,7 +156,7 @@
@@ -297,7 +383,7 @@
}
protected double o() {
protected double p() {
- return 0.4D;
+ return this.maxSpeed; // CraftBukkit
}