mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-13 07:28:19 +02:00
05466e3b47
Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes:a9c796f1SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations195f071eSPIGOT-4219: Event for PigZombies angering.5e3082c7SPIGOT-4230: Improve legacy block types
45 lines
2.1 KiB
Diff
45 lines
2.1 KiB
Diff
From 402578e7374284a7fcf9e856ea73afde425701cd Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
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 c1dd2db89d..b106454447 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -2471,14 +2471,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.g && packetplayinkeepalive.b() == this.h) {
|
|
int i = (int) (SystemUtils.b() - this.f);
|
|
|
|
this.player.ping = (this.player.ping * 3 + i) / 4;
|
|
this.g = false;
|
|
} else if (!this.player.getDisplayName().getString().equals(this.minecraftServer.I())) {
|
|
- 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.18.0
|
|
|