From c7bc393a87fb54c8805702666742e6cf233253c6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 May 2020 04:50:08 -0400 Subject: [PATCH] Revert "Don't flush packet queue off main thread" This reverts commit 1abd2bd279e556fdd3cd99eae49bbf51fb9591d3. Sadly not gonna work due to server pings --- ...ndle-Excessive-Signs-in-Chunks-creating-large-pack.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-large-pack.patch b/Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-large-pack.patch index ca718327e4..4c78fc8257 100644 --- a/Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-large-pack.patch +++ b/Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-large-pack.patch @@ -1,4 +1,4 @@ -From 10a32d733a851719edd4c52fc25d673f1e3be4fd Mon Sep 17 00:00:00 2001 +From 57f98e2c510b576b4d3c94b12384b1bc4b6b5e33 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 14:55:01 -0500 Subject: [PATCH] Handle Excessive Signs in Chunks creating large packets @@ -14,7 +14,7 @@ With further contributions from Co-Authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index b1dededc15..07e3ddb6e9 100644 +index b1dededc15..e966b6edcc 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -158,19 +158,55 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -73,7 +73,7 @@ index b1dededc15..07e3ddb6e9 100644 + + this.packetQueue.addAll(packets); // atomic + } -+ if (MCUtil.isMainThread()) this.sendPacketQueue(); ++ this.sendPacketQueue(); // ensure only one flush call is made + // Paper end }