Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN
0cef14e4 Remove draft API from selectEntities

CraftBukkit Changes:
a46fdbc6 Remove outdated build delay.
3697519b SPIGOT-4708: Fix ExactChoice recipes neglecting material
9ead7009 SPIGOT-4677: Add minecraft.admin.command_feedback permission
c3749a23 Remove the Damage tag from items when it is 0.
f74c7b95 SPIGOT-4706: Can't interact with active item
494eef45 Mention requirement of JIRA ticket for bug fixes
51d62dec SPIGOT-4702: Exception when middle clicking certain slots
be557e69 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN

1 files changed, 44 insertions, 0 deletions

diff --git a/Spigot-Server-Patches/0205-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0205-handle-PacketPlayInKeepAlive-async.patch
new file mode 100644
index 0000000000..8cae7e3a2b
--- /dev/null
+++ b/Spigot-Server-Patches/0205-handle-PacketPlayInKeepAlive-async.patch
@@ -0,0 +1,44 @@
+From 5b9b0efc388810e9be0e7b7ccc532a7e8cbcc10b Mon Sep 17 00:00:00 2001
+From: Shane Freeder <[email protected]>
+Date: Thu, 5 Oct 2017 01:54:07 +0100
+Subject: [PATCH] handle PacketPlayInKeepAlive async
+
+In 1.12.2, Mojang moved the processing of PacketPlayInKeepAlive off the main
+thread, while entirely correct for the server, this causes issues with
+plugins which are expecting the PlayerQuitEvent on the main thread.
+
+In order to counteract some bad behavior, we will post handling of the
+disconnection to the main thread, but leave the actual processing of the packet
+off the main thread.
+
+also adding some additional logging in order to help work out what is causing
+random disconnections for clients.
+
+diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+index 5fa3268b59..0d87ddc0f5 100644
+--- a/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/PlayerConnection.java
+@@ -2451,14 +2451,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+     }
+ 
+     public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
+-        PlayerConnectionUtils.ensureMainThread(packetplayinkeepalive, this, this.player.getWorldServer()); // CraftBukkit
++        //PlayerConnectionUtils.ensureMainThread(packetplayinkeepalive, this, this.player.getWorldServer()); // CraftBukkit // Paper - This shouldn't be on the main thread
+         if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
+             int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
+ 
+             this.player.ping = (this.player.ping * 3 + i) / 4;
+             this.awaitingKeepAlive = false;
+         } else if (!this.player.getDisplayName().getString().equals(this.minecraftServer.G())) {
+-            this.disconnect(new ChatMessage("disconnect.timeout", new Object[0]));
++            // Paper start - This needs to be handled on the main thread for plugins
++            minecraftServer.postToMainThread(() -> {
++                this.disconnect(new ChatMessage("disconnect.timeout", new Object[0]));
++            });
++            // Paper end
+         }
+ 
+     }
+-- 
+2.21.0
+