From f3124c37c570939a1e23ba355c84d20c84467da1 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Thu, 8 Jun 2023 10:25:32 -0700 Subject: [PATCH] add 1 more networking patch and add comments to dropped patches --- .../server/Optimise-non-flush-packet-sending.patch | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) rename patches/{unapplied => }/server/Optimise-non-flush-packet-sending.patch (86%) diff --git a/patches/unapplied/server/Optimise-non-flush-packet-sending.patch b/patches/server/Optimise-non-flush-packet-sending.patch similarity index 86% rename from patches/unapplied/server/Optimise-non-flush-packet-sending.patch rename to patches/server/Optimise-non-flush-packet-sending.patch index a36c0130bb..02299d8b5a 100644 --- a/patches/unapplied/server/Optimise-non-flush-packet-sending.patch +++ b/patches/server/Optimise-non-flush-packet-sending.patch @@ -23,15 +23,6 @@ diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java -@@ -0,0 +0,0 @@ import org.slf4j.Logger; - import org.slf4j.Marker; - import org.slf4j.MarkerFactory; - -+ -+import io.netty.util.concurrent.AbstractEventExecutor; // Paper - public class Connection extends SimpleChannelInboundHandler> { - - private static final float AVERAGE_PACKETS_SMOOTHING = 0.75F; @@ -0,0 +0,0 @@ public class Connection extends SimpleChannelInboundHandler> { if (this.channel.eventLoop().inEventLoop()) { this.doSendPacket(packet, callbacks, enumprotocol, enumprotocol1, flush); // Paper @@ -40,7 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // note: since the type is not dynamic here, we need to actually copy the old executor code + // into two branches. On conflict, just re-copy - no changes were made inside the executor code. + if (!flush) { -+ AbstractEventExecutor.LazyRunnable run = () -> { ++ io.netty.util.concurrent.AbstractEventExecutor.LazyRunnable run = () -> { + this.doSendPacket(packet, callbacks, enumprotocol, enumprotocol1, flush); // Paper - add flush parameter + }; + this.channel.eventLoop().execute(run);