From 9b1c97919c88a68fdd62c7ab8cdaa494e022b9ef Mon Sep 17 00:00:00 2001
From: EnZaXD <60033407+FlorianMichael@users.noreply.github.com>
Date: Wed, 22 May 2024 09:44:38 +0200
Subject: [PATCH] Only soft fail CUSTOM_PAYLOAD content reading (#3873)

Reading of the channel shouldn't be soft failed as the game code only try catches content reading
---
 .../protocols/v1_20to1_20_2/Protocol1_20To1_20_2.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/Protocol1_20To1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/Protocol1_20To1_20_2.java
index 520b3430b..ce7b77597 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/Protocol1_20To1_20_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/Protocol1_20To1_20_2.java
@@ -81,10 +81,14 @@ public final class Protocol1_20To1_20_2 extends AbstractProtocol<ClientboundPack
         registerClientbound(ClientboundPackets1_19_4.CUSTOM_PAYLOAD, new PacketHandlers() {
             @Override
             protected void register() {
+                map(Types.STRING); // Channel
                 handlerSoftFail(Protocol1_20To1_20_2::sanitizeCustomPayload);
             }
         });
-        registerServerbound(ServerboundPackets1_20_2.CUSTOM_PAYLOAD, Protocol1_20To1_20_2::sanitizeCustomPayload);
+        registerServerbound(ServerboundPackets1_20_2.CUSTOM_PAYLOAD, wrapper -> {
+            wrapper.passthrough(Types.STRING); // Channel
+            sanitizeCustomPayload(wrapper);
+        });
 
         registerClientbound(ClientboundPackets1_19_4.RESOURCE_PACK, wrapper -> {
             final String url = wrapper.passthrough(Types.STRING);
@@ -205,7 +209,7 @@ public final class Protocol1_20To1_20_2 extends AbstractProtocol<ClientboundPack
     }
 
     private static void sanitizeCustomPayload(final PacketWrapper wrapper) {
-        final String channel = Key.namespaced(wrapper.passthrough(Types.STRING));
+        final String channel = Key.namespaced(wrapper.get(Types.STRING, 0));
         if (channel.equals("minecraft:brand")) {
             wrapper.passthrough(Types.STRING);
             wrapper.clearInputBuffer();