2019-05-06 04:58:04 +02:00
From 1c4c4bb0482e6d05872f36222423a4ac1e228074 Mon Sep 17 00:00:00 2001
2017-10-05 03:25:41 +02:00
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 5 Oct 2017 01:54:07 +0100
2017-10-15 15:00:42 +02:00
Subject: [PATCH] handle PacketPlayInKeepAlive async
2017-10-05 03:25:41 +02:00
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
2017-10-06 05:27:26 +02:00
off the main thread.
2017-10-05 03:25:41 +02:00
2017-10-15 15:00:42 +02:00
also adding some additional logging in order to help work out what is causing
random disconnections for clients.
2017-10-09 10:49:12 +02:00
2017-10-05 03:25:41 +02:00
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
2019-05-06 04:58:04 +02:00
index 7a4b14f865..de34c4e3ee 100644
2017-10-05 03:25:41 +02:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2019-05-06 04:58:04 +02:00
@@ -2503,14 +2503,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
2017-10-05 03:25:41 +02:00
2019-04-28 01:23:53 +02:00
@Override
2017-10-05 03:25:41 +02:00
public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
2018-07-18 02:08:13 +02:00
- PlayerConnectionUtils.ensureMainThread(packetplayinkeepalive, this, this.player.getWorldServer()); // CraftBukkit
2018-07-31 16:19:18 +02:00
+ //PlayerConnectionUtils.ensureMainThread(packetplayinkeepalive, this, this.player.getWorldServer()); // CraftBukkit // Paper - This shouldn't be on the main thread
2018-12-17 06:18:06 +01:00
if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
2017-10-05 03:25:41 +02:00
this.player.ping = (this.player.ping * 3 + i) / 4;
2018-12-17 06:18:06 +01:00
this.awaitingKeepAlive = false;
2019-04-28 01:23:53 +02:00
} else if (!this.isExemptPlayer()) {
2017-10-05 03:25:41 +02:00
- this.disconnect(new ChatMessage("disconnect.timeout", new Object[0]));
+ // Paper start - This needs to be handled on the main thread for plugins
+ minecraftServer.postToMainThread(() -> {
2019-04-28 01:23:53 +02:00
+ this.disconnect(new ChatMessage("disconnect.timeout"));
2017-10-05 03:25:41 +02:00
+ });
+ // Paper end
}
}
--
2019-03-20 02:46:00 +01:00
2.21.0
2017-10-05 03:25:41 +02:00