another patch

1 files changed, 0 insertions, 34 deletions

diff --git a/patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch
deleted file mode 100644
index 7513b75abe..0000000000
--- a/patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-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 84fe0f6cfc928d95d0967ad368a38afb71543af7..0aacf2e0155a9a7c9dfe9b368a251aee25ed24fc 100644
---- a/src/main/java/net/minecraft/network/Connection.java
-+++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -86,6 +86,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) {
-@@ -259,7 +260,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) {