From ed1852ba40c55ae62ee8a8d292606e6af687b050 Mon Sep 17 00:00:00 2001
From: RK_01 <50594595+RaphiMC@users.noreply.github.com>
Date: Mon, 25 Sep 2023 00:52:17 +0200
Subject: [PATCH] Fix 1.20.2 -> 1.20.1 brand custom payloads properly (#3440)

---
 .../Protocol1_20_2To1_20.java                 | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java
index d6a8ef76e..54ec9322f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java
@@ -48,9 +48,10 @@ import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.storage.Configur
 import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.storage.ConfigurationState.BridgePhase;
 import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.storage.LastResourcePack;
 import com.viaversion.viaversion.rewriter.SoundRewriter;
-import java.util.UUID;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import java.util.UUID;
+
 public final class Protocol1_20_2To1_20 extends AbstractProtocol<ClientboundPackets1_19_4, ClientboundPackets1_20_2, ServerboundPackets1_19_4, ServerboundPackets1_20_2> {
 
     public static final MappingData MAPPINGS = new MappingDataBase("1.20", "1.20.2");
@@ -73,11 +74,15 @@ public final class Protocol1_20_2To1_20 extends AbstractProtocol<ClientboundPack
         registerClientbound(ClientboundPackets1_19_4.PLUGIN_MESSAGE, wrapper -> {
             final String channel = wrapper.passthrough(Type.STRING);
             if (channel.equals("minecraft:brand")) {
-                final String brand = wrapper.passthrough(Type.STRING);
-                // TODO No idea what's going on here
-                if (!brand.matches("[a-zA-Z0-9]+")) {
-                    wrapper.cancel();
-                }
+                wrapper.passthrough(Type.STRING);
+                wrapper.read(Type.REMAINING_BYTES);
+            }
+        });
+        registerServerbound(ServerboundPackets1_20_2.PLUGIN_MESSAGE, wrapper -> {
+            final String channel = wrapper.passthrough(Type.STRING);
+            if (channel.equals("minecraft:brand")) {
+                wrapper.passthrough(Type.STRING);
+                wrapper.read(Type.REMAINING_BYTES);
             }
         });
 
@@ -298,4 +303,4 @@ public final class Protocol1_20_2To1_20 extends AbstractProtocol<ClientboundPack
     public ItemRewriter<Protocol1_20_2To1_20> getItemRewriter() {
         return itemPacketRewriter;
     }
-}
\ No newline at end of file
+}