2020-05-06 11:48:49 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2018-03-11 19:15:38 +01:00
From: Aikar <aikar@aikar.co>
Date: Sun, 11 Mar 2018 14:13:33 -0400
2018-03-11 19:21:03 +01:00
Subject: [PATCH] Disable Explicit Network Manager Flushing
2018-03-11 19:15:38 +01:00
This seems completely pointless, as packet dispatch uses .writeAndFlush.
2018-03-11 19:21:03 +01:00
Things seem to work fine without explicit flushing, but incase issues arise,
2018-03-11 19:15:38 +01:00
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.
2018-03-11 19:21:03 +01:00
Renable flushing by passing -Dpaper.explicit-flush=true
2018-03-11 19:15:38 +01:00
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
2020-06-25 15:11:48 +02:00
index 33900c22d4123e0f8333b9bdb9601d302e26c972..8cb29ddc0d5a5951ea35e1a16c023efb9b0be42d 100644
2018-03-11 19:15:38 +01:00
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
2019-07-20 06:01:24 +02:00
@@ -63,6 +63,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
2018-03-11 19:15:38 +01:00
// Paper start - NetworkClient implementation
public int protocolVersion;
public java.net.InetSocketAddress virtualHost;
2018-03-11 19:21:03 +01:00
+ private static boolean enableExplicitFlush = Boolean.getBoolean("paper.explicit-flush");
2018-03-11 19:15:38 +01:00
// Paper end
public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
2020-06-25 15:11:48 +02:00
@@ -230,7 +231,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
2018-03-11 19:15:38 +01:00
}
if (this.channel != null) {
- this.channel.flush();
2018-03-11 19:21:03 +01:00
+ 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
2018-03-11 19:15:38 +01:00
}
2019-07-20 06:01:24 +02:00
if (this.t++ % 20 == 0) {