diff options
author | md_5 <git@md-5.net> | 2017-06-08 18:00:00 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2017-06-08 18:00:00 +1000 |
commit | bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772 (patch) | |
tree | a8e03741d518f6448cf4c5410b194a4396fede5e /nms-patches/EntityMinecartAbstract.patch | |
parent | fe3ca95c764848be56e872e3de57c66cb07d7515 (diff) | |
download | craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.gz craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.lz craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.xz craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.zip |
Update to Minecraft 1.12
Diffstat (limited to 'nms-patches/EntityMinecartAbstract.patch')
-rw-r--r-- | nms-patches/EntityMinecartAbstract.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nms-patches/EntityMinecartAbstract.patch b/nms-patches/EntityMinecartAbstract.patch index 9c55d1e8..5f5d0706 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.av(); + this.ax(); @@ -108,6 +141,15 @@ boolean flag = damagesource.getEntity() instanceof EntityHuman && ((EntityHuman) damagesource.getEntity()).abilities.canInstantlyBuild; @@ -93,7 +93,7 @@ + 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.aK(); + this.portalCooldown = this.aM(); @@ -266,6 +316,18 @@ } |