geforkt von Mirrors/Paper
36f34f01c0
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: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
42 Zeilen
2.2 KiB
Diff
42 Zeilen
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 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 b0651dcfbfccab63108ece34304700db9af407b6..d4a649a83f8e0497898108c52faf4baf9ba824f9 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -2487,14 +2487,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()) {
|
|
- this.disconnect(new ChatMessage("disconnect.timeout", new Object[0]));
|
|
+ // Paper start - This needs to be handled on the main thread for plugins
|
|
+ minecraftServer.scheduleOnMain(() -> {
|
|
+ this.disconnect(new ChatMessage("disconnect.timeout"));
|
|
+ });
|
|
+ // Paper end
|
|
}
|
|
|
|
}
|