From 32ef77f9541229d04bdc35c4d5d2ade2ef86b772 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Wed, 7 Aug 2019 16:04:34 -0400 Subject: [PATCH] Flush consolidation tweaks --- .../proxy/connection/backend/VelocityServerConnection.java | 6 +++--- .../proxy/network/ServerChannelInitializer.java | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java index 2f0a45333..c67d32608 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java @@ -84,6 +84,8 @@ public class VelocityServerConnection implements MinecraftConnectionAssociation, @Override protected void initChannel(Channel ch) throws Exception { ch.pipeline() + .addLast(FLUSH_CONSOLIDATION, new FlushConsolidationHandler( + DEFAULT_EXPLICIT_FLUSH_AFTER_FLUSHES, true)) .addLast(READ_TIMEOUT, new ReadTimeoutHandler(server.getConfiguration().getReadTimeout(), TimeUnit.MILLISECONDS)) @@ -93,9 +95,7 @@ public class VelocityServerConnection implements MinecraftConnectionAssociation, .addLast(MINECRAFT_DECODER, new MinecraftDecoder(ProtocolUtils.Direction.CLIENTBOUND)) .addLast(MINECRAFT_ENCODER, - new MinecraftEncoder(ProtocolUtils.Direction.SERVERBOUND)) - .addLast(FLUSH_CONSOLIDATION, new FlushConsolidationHandler( - DEFAULT_EXPLICIT_FLUSH_AFTER_FLUSHES, true)); + new MinecraftEncoder(ProtocolUtils.Direction.SERVERBOUND)); } }) .connect(registeredServer.getServerInfo().getAddress()) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/network/ServerChannelInitializer.java b/proxy/src/main/java/com/velocitypowered/proxy/network/ServerChannelInitializer.java index f91c8b5eb..9f54a4e53 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/network/ServerChannelInitializer.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/network/ServerChannelInitializer.java @@ -14,7 +14,6 @@ import com.velocitypowered.proxy.VelocityServer; import com.velocitypowered.proxy.connection.MinecraftConnection; import com.velocitypowered.proxy.connection.client.HandshakeSessionHandler; import com.velocitypowered.proxy.protocol.ProtocolUtils; -import com.velocitypowered.proxy.protocol.StateRegistry; import com.velocitypowered.proxy.protocol.netty.LegacyPingDecoder; import com.velocitypowered.proxy.protocol.netty.LegacyPingEncoder; import com.velocitypowered.proxy.protocol.netty.MinecraftDecoder; @@ -40,6 +39,8 @@ public class ServerChannelInitializer extends ChannelInitializer { @Override protected void initChannel(final Channel ch) { ch.pipeline() + .addLast(FLUSH_CONSOLIDATION, new FlushConsolidationHandler( + DEFAULT_EXPLICIT_FLUSH_AFTER_FLUSHES, true)) .addLast(READ_TIMEOUT, new ReadTimeoutHandler(this.server.getConfiguration().getReadTimeout(), TimeUnit.MILLISECONDS)) @@ -48,9 +49,7 @@ public class ServerChannelInitializer extends ChannelInitializer { .addLast(LEGACY_PING_ENCODER, LegacyPingEncoder.INSTANCE) .addLast(FRAME_ENCODER, MinecraftVarintLengthEncoder.INSTANCE) .addLast(MINECRAFT_DECODER, new MinecraftDecoder(ProtocolUtils.Direction.SERVERBOUND)) - .addLast(MINECRAFT_ENCODER, new MinecraftEncoder(ProtocolUtils.Direction.CLIENTBOUND)) - .addLast(FLUSH_CONSOLIDATION, new FlushConsolidationHandler( - DEFAULT_EXPLICIT_FLUSH_AFTER_FLUSHES, true)); + .addLast(MINECRAFT_ENCODER, new MinecraftEncoder(ProtocolUtils.Direction.CLIENTBOUND)); final MinecraftConnection connection = new MinecraftConnection(ch, this.server); connection.setSessionHandler(new HandshakeSessionHandler(connection, this.server));