2018-08-26 04:37:58 +02:00
From 1c884ab552ea64dad0dd97cecd57f6eb71c5074e 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
2018-08-26 04:37:58 +02:00
index 4f3f88ff..f8facddb 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
2018-07-18 20:55:52 +02:00
@@ -66,6 +66,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) {
2018-08-26 04:37:58 +02:00
@@ -238,7 +239,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
}
2018-07-18 20:55:52 +02:00
if (this.u++ % 20 == 0) {
2018-03-11 19:15:38 +01:00
--
2018-08-26 04:37:58 +02:00
2.14.1.windows.1
2018-03-11 19:15:38 +01:00