geforkt von Mirrors/Paper
35 Zeilen
1.7 KiB
Diff
35 Zeilen
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
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/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
|
||
|
|
index 3429c813a5b471cdfa561bd20849a303e5aacead..7f4681910751047a26fdfc6b59bc460449c02001 100644
|
||
|
|
--- a/src/main/java/net/minecraft/network/Connection.java
|
||
|
|
+++ b/src/main/java/net/minecraft/network/Connection.java
|
||
|
|
@@ -73,6 +73,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
|
||
|
|
// Paper start - NetworkClient implementation
|
||
|
|
public int protocolVersion;
|
||
|
|
public java.net.InetSocketAddress virtualHost;
|
||
|
|
+ private static boolean enableExplicitFlush = Boolean.getBoolean("paper.explicit-flush");
|
||
|
|
// Paper end
|
||
|
|
|
||
|
|
public Connection(PacketFlow side) {
|
||
|
|
@@ -240,7 +241,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
|
||
|
|
}
|
||
|
|
|
||
|
|
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.tickCount++ % 20 == 0) {
|