From 1a1af91ce3d092230cf782630d8cc374ace2b742 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 24 Sep 2023 19:48:29 +0100
Subject: [PATCH] Handle new brand payload type

---
 patches/server/Brand-support.patch | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/patches/server/Brand-support.patch b/patches/server/Brand-support.patch
index 2b7e7b43bb..81d7d9e74c 100644
--- a/patches/server/Brand-support.patch
+++ b/patches/server/Brand-support.patch
@@ -18,10 +18,22 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public ServerCommonPacketListenerImpl(MinecraftServer minecraftserver, Connection networkmanager, CommonListenerCookie commonlistenercookie, ServerPlayer player) { // CraftBukkit
          this.server = minecraftserver;
 @@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+ 
+     @Override
+     public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
++        // Paper start - handle brand payload packet
++        if (packet.payload() instanceof net.minecraft.network.protocol.common.custom.BrandPayload brandPayload) {
++            this.clientBrandName = brandPayload.brand();
++        }
++        // Paper end - handle brand payload
+         if (!(packet.payload() instanceof ServerboundCustomPayloadPacket.UnknownPayload)) {
+             return;
+         }
+@@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
              try {
                  byte[] data = new byte[payload.readableBytes()];
                  payload.readBytes(data);
-+                // Paper start - Brand support
++                // Paper start - Brand support - Retain this incase upstream decides to 'break' the new mechanism in favour of backwards compat...
 +                if (identifier.equals(MINECRAFT_BRAND)) {
 +                    try {
 +                        this.clientBrandName = new net.minecraft.network.FriendlyByteBuf(io.netty.buffer.Unpooled.copiedBuffer(data)).readUtf(256);