From 1e1413f50f5a67afcf8a7a2d53f85af1b349aa32 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 11 Mar 2018 14:13:33 -0400 Subject: [PATCH] Disable Explicit Network Manager Flushing This seems completely pointless, as packet dispatch uses .writeAndFlush. Things seem to work fine without explicit flushing, but incase issues arise, provide a System property to re-enable it using improved logic of doing the flushing on the netty event loop, so it won't do the flush on the main thread. Renable flushing by passing -Dpaper.explicit-flush=true diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java index 61f9eb3e64..2272f1239b 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -66,6 +66,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { // Paper start - NetworkClient implementation public int protocolVersion; public java.net.InetSocketAddress virtualHost; + private static boolean enableExplicitFlush = Boolean.getBoolean("paper.explicit-flush"); // Paper end public NetworkManager(EnumProtocolDirection enumprotocoldirection) { @@ -236,7 +237,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { } if (this.channel != null) { - this.channel.flush(); + if (enableExplicitFlush) this.channel.eventLoop().execute(() -> this.channel.flush()); // Paper - we don't need to explicit flush here, but allow opt in incase issues are found to a better version } if (this.u++ % 20 == 0) { -- 2.18.0