Move patches

1 files changed, 40 insertions, 0 deletions

diff --git a/Spigot-Server-Patches-Unmapped/0171-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches-Unmapped/0171-handle-PacketPlayInKeepAlive-async.patch
new file mode 100644
index 0000000000..1d3d75d1c5
--- /dev/null
+++ b/Spigot-Server-Patches-Unmapped/0171-handle-PacketPlayInKeepAlive-async.patch
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 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/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
+index 7af07ca8e1fa20361c95841b48dd70cdf46a18b5..685415240d7be66fe968198b33c1865a906e18c9 100644
+--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
+@@ -2778,14 +2778,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
+ 
+     @Override
+     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.isExemptPlayer()) {
++            // Paper start - This needs to be handled on the main thread for plugins
++            minecraftServer.scheduleOnMain(() -> {
+             this.disconnect(new ChatMessage("disconnect.timeout"));
++            });
++            // Paper end
+         }
+ 
+     }