From 38558783bb6848b33f0c4c997b91e21dde993d55 Mon Sep 17 00:00:00 2001
From: Adrian <68704415+4drian3d@users.noreply.github.com>
Date: Mon, 29 Jan 2024 09:13:17 -0500
Subject: [PATCH] Fixed client brand handling for players with versions 1.20.2
 or higher (#1223)

This commit fixes the sending of the client brand to the backend server and the execution of the PlayerClientBrandEvent from players with versions 1.20.2 or higher
---
 .../client/ClientConfigSessionHandler.java    | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 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 db1e26988..759e2775f 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
@@ -114,19 +114,17 @@ public class ClientConfigSessionHandler implements MinecraftSessionHandler {
   }
 
   @Override
-  public boolean handle(PluginMessagePacket packet) {
-    VelocityServerConnection serverConn = player.getConnectionInFlight();
-    if (serverConn != null) {
-      if (PluginMessageUtil.isMcBrand(packet)) {
-        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
-      } else {
-        serverConn.ensureConnected().write(packet.retain());
-      }
+  public boolean handle(final PluginMessagePacket packet) {
+    final VelocityServerConnection serverConn = player.getConnectionInFlight();
+    if (PluginMessageUtil.isMcBrand(packet)) {
+      final 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
+    } else if (serverConn != null) {
+      serverConn.ensureConnected().write(packet.retain());
     }
     return true;
   }
@@ -158,13 +156,13 @@ public class ClientConfigSessionHandler implements MinecraftSessionHandler {
 
   @Override
   public void handleUnknown(ByteBuf buf) {
-    VelocityServerConnection serverConnection = player.getConnectedServer();
+    final VelocityServerConnection serverConnection = player.getConnectedServer();
     if (serverConnection == null) {
       // No server connection yet, probably transitioning.
       return;
     }
 
-    MinecraftConnection smc = serverConnection.getConnection();
+    final MinecraftConnection smc = serverConnection.getConnection();
     if (smc != null && !smc.isClosed() && serverConnection.getPhase().consideredComplete()) {
       smc.write(buf.retain());
     }
@@ -188,13 +186,13 @@ public class ClientConfigSessionHandler implements MinecraftSessionHandler {
    * @return a future that completes when the config stage is finished
    */
   public CompletableFuture<Void> handleBackendFinishUpdate(VelocityServerConnection serverConn) {
-    MinecraftConnection smc = serverConn.ensureConnected();
+    final MinecraftConnection smc = serverConn.ensureConnected();
 
-    String brand = serverConn.getPlayer().getClientBrand();
+    final String brand = serverConn.getPlayer().getClientBrand();
     if (brand != null && brandChannel != null) {
-      ByteBuf buf = Unpooled.buffer();
+      final ByteBuf buf = Unpooled.buffer();
       ProtocolUtils.writeString(buf, brand);
-      PluginMessagePacket brandPacket = new PluginMessagePacket(brandChannel, buf);
+      final PluginMessagePacket brandPacket = new PluginMessagePacket(brandChannel, buf);
       smc.write(brandPacket);
     }