From b6cd19b4ae5d2e4e554dc4d4a8c1a6ee182e597c Mon Sep 17 00:00:00 2001 From: cpw Date: Sat, 7 Sep 2019 18:42:50 -0400 Subject: [PATCH] Fix problem with network connections timing out frequently. Turns out there's a race condition - and the extra work forge does causes it to happen much more frequently than vanilla (though I'm sure it's a vanilla issue). Closes #6124, #5767 and probably lots more. Signed-off-by: cpw --- .../net/minecraft/network/NetworkManager.java.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/patches/minecraft/net/minecraft/network/NetworkManager.java.patch b/patches/minecraft/net/minecraft/network/NetworkManager.java.patch index 9f73939456..dce759fabb 100644 --- a/patches/minecraft/net/minecraft/network/NetworkManager.java.patch +++ b/patches/minecraft/net/minecraft/network/NetworkManager.java.patch @@ -16,6 +16,15 @@ try { this.func_150723_a(ProtocolType.HANDSHAKING); +@@ -173,7 +175,7 @@ + ++this.field_211395_r; + if (protocoltype1 != protocoltype) { + field_150735_g.debug("Disabled auto read"); +- this.field_150746_k.config().setAutoRead(false); ++ this.field_150746_k.eventLoop().execute(()->this.field_150746_k.config().setAutoRead(false)); + } + + if (this.field_150746_k.eventLoop().inEventLoop()) { @@ -257,7 +259,9 @@ @OnlyIn(Dist.CLIENT)