diff options
| author | md_5 <git@md-5.net> | 2017-05-14 12:00:00 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-05-14 12:00:00 +1000 |
| commit | 5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5 (patch) | |
| tree | 0314ba59f51141bb5e0e7ff6ca7723d168ac94b9 /nms-patches/EntityMinecartAbstract.patch | |
| parent | 6e3cec8bc78269d72ef7ef49ce82a5eadfb9615a (diff) | |
| download | craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar.gz craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar.lz craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar.xz craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.zip | |
Update to Minecraft 1.12-pre2
Diffstat (limited to 'nms-patches/EntityMinecartAbstract.patch')
| -rw-r--r-- | nms-patches/EntityMinecartAbstract.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nms-patches/EntityMinecartAbstract.patch b/nms-patches/EntityMinecartAbstract.patch index 2760942b..3a325170 100644 --- a/nms-patches/EntityMinecartAbstract.patch +++ b/nms-patches/EntityMinecartAbstract.patch @@ -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 } |