From 3e4fec905ce46b02bd0368f16aa0ae36cda6147a 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 e3105bc57a620a910ba1cd40c5a39a1cb01310e3. Sadly not gonna work due to server pings --- ...Handle-Excessive-Signs-in-Chunks-creating-large-pack.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/Handle-Excessive-Signs-in-Chunks-creating-large-pack.patch b/Spigot-Server-Patches/Handle-Excessive-Signs-in-Chunks-creating-large-pack.patch index 7fdd6dd1e3..6b3a14cae8 100644 --- a/Spigot-Server-Patches/Handle-Excessive-Signs-in-Chunks-creating-large-pack.patch +++ b/Spigot-Server-Patches/Handle-Excessive-Signs-in-Chunks-creating-large-pack.patch @@ -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 @@ -0,0 +0,0 @@ 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 }