From e5176717a972155419f3a5dbb772b234de5efd33 Mon Sep 17 00:00:00 2001 From: AoElite <20812471+AoElite@users.noreply.github.com> Date: Thu, 30 Nov 2023 15:18:40 -0500 Subject: [PATCH] fix backend not receiving brands from 1.20.2 clients (#1147) --- .../client/ClientConfigSessionHandler.java | 14 +++++++++++++- .../client/ClientPlaySessionHandler.java | 4 +--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientConfigSessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientConfigSessionHandler.java index 6cc6be5aa..484b1cd81 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientConfigSessionHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientConfigSessionHandler.java @@ -32,6 +32,8 @@ import com.velocitypowered.proxy.protocol.packet.ResourcePackResponse; import com.velocitypowered.proxy.protocol.packet.config.FinishedUpdate; import com.velocitypowered.proxy.protocol.util.PluginMessageUtil; import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import java.nio.charset.StandardCharsets; import java.util.concurrent.CompletableFuture; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; @@ -46,6 +48,7 @@ public class ClientConfigSessionHandler implements MinecraftSessionHandler { private static final Logger logger = LogManager.getLogger(ClientConfigSessionHandler.class); private final VelocityServer server; private final ConnectedPlayer player; + private String brandChannel = null; private CompletableFuture configSwitchFuture; @@ -116,8 +119,9 @@ public class ClientConfigSessionHandler implements MinecraftSessionHandler { String brand = PluginMessageUtil.readBrandMessage(packet.content()); server.getEventManager().fireAndForget(new PlayerClientBrandEvent(player, brand)); player.setClientBrand(brand); + brandChannel = packet.getChannel(); // Client sends `minecraft:brand` packet immediately after Login, - // but at this time the backend server may not be ready, just discard it. + // but at this time the backend server may not be ready } else { serverConn.ensureConnected().write(packet.retain()); } @@ -182,6 +186,14 @@ public class ClientConfigSessionHandler implements MinecraftSessionHandler { * @return a future that completes when the config stage is finished */ public CompletableFuture handleBackendFinishUpdate(VelocityServerConnection serverConn) { + String brand = serverConn.getPlayer().getClientBrand(); + if (brand != null && brandChannel != null) { + ByteBuf buf = Unpooled.buffer(); + buf.writeCharSequence(brand, StandardCharsets.UTF_8); + PluginMessage brandPacket = new PluginMessage(brandChannel, buf); + serverConn.ensureConnected().write(brandPacket); + } + player.getConnection().write(new FinishedUpdate()); serverConn.ensureConnected().write(new FinishedUpdate()); return configSwitchFuture; diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java index 87b2a1fdc..e9a3211f5 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java @@ -318,9 +318,7 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler { String brand = PluginMessageUtil.readBrandMessage(packet.content()); server.getEventManager().fireAndForget(new PlayerClientBrandEvent(player, brand)); player.setClientBrand(brand); - backendConn.write( - PluginMessageUtil.rewriteMinecraftBrand(packet, server.getVersion(), - player.getProtocolVersion())); + backendConn.write(packet.retain()); } else if (BungeeCordMessageResponder.isBungeeCordMessage(packet)) { return true; } else {