Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appears to apply and compile correctly.

This update has been tested to ensure that World Conversion still occurs correctly.

Bukkit Changes:
0812ce2c SPIGOT-4397: isChunkGenerated API

CraftBukkit Changes:
4824655c SPIGOT-4398: Upgrade to ASM 6.2.1 for better Java 11 support
eea43870 MC-134115: Fix issues converting tile entities
1a7f2d10 SPIGOT-4397: isChunkGenerated API
40aed54d SPIGOT-4396: Improve vehicle movement

Spigot Changes:
f6a273b1 Rebuild patches
This commit is contained in:
Aikar
2018-09-26 22:35:42 -04:00
parent c5fbde9f17
commit 2365b308c8
143 changed files with 547 additions and 765 deletions

View File

@@ -1,11 +1,11 @@
From 80c3e9f2c71f29c8d955b0fee18ee43a3290d0cc Mon Sep 17 00:00:00 2001
From 11d11e3eb36a88359c91a8c569c2405f0b2e620f Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 28 Sep 2017 17:21:44 -0400
Subject: [PATCH] Add PlayerJumpEvent
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 504c9ad4..4ac310ba 100644
index 504c9ad473..4ac310bae1 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1476,6 +1476,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -17,7 +17,7 @@ index 504c9ad4..4ac310ba 100644
super.cH();
this.a(StatisticList.JUMP);
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 8c7428c0..1294ce56 100644
index 450f045603..3b02b6cb4d 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -59,6 +59,8 @@ import org.bukkit.inventory.CraftingInventory;
@@ -29,7 +29,7 @@ index 8c7428c0..1294ce56 100644
import co.aikar.timings.MinecraftTimings; // Paper
// CraftBukkit end
@@ -874,7 +876,34 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -876,7 +878,34 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
d8 = d5 - this.p;
d9 = d6 - this.q;
if (this.player.onGround && !packetplayinflying.b() && d8 > 0.0D) {
@@ -66,5 +66,5 @@ index 8c7428c0..1294ce56 100644
this.player.move(EnumMoveType.PLAYER, d7, d8, d9);
--
2.18.0.windows.1
2.19.0