From 1977a5b12c01f915d7c04a765b18957cbfbeeb24 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Fri, 28 Mar 2025 16:44:13 -0400 Subject: [PATCH] Fix purpur client identifying --- .../0007-Purpur-Server-Minecraft-Changes.patch | 17 +++++++++-------- .../features/0021-Leaves-Protocol-Core.patch | 4 ++-- ...i-Configurable-chat-message-signatures.patch | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/leaf-server/minecraft-patches/features/0007-Purpur-Server-Minecraft-Changes.patch b/leaf-server/minecraft-patches/features/0007-Purpur-Server-Minecraft-Changes.patch index 568a19dd..de6d525b 100644 --- a/leaf-server/minecraft-patches/features/0007-Purpur-Server-Minecraft-Changes.patch +++ b/leaf-server/minecraft-patches/features/0007-Purpur-Server-Minecraft-Changes.patch @@ -1253,7 +1253,7 @@ index 623c069f1fe079e020c6391a3db1a3d95cd3dbf5..a660bad3dfdb442c6aca5eb939ee103e + // Purpur end - Shift right click to use exp for mending } diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 060becd4c0b7aa399496ad70ba28cb3449cfaea3..b72b3fdfad0be25f6ece6b934c47a748509de5d6 100644 +index 060becd4c0b7aa399496ad70ba28cb3449cfaea3..921ad69b699f693e3dfc8d912b0f1a05d8f81743 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -54,6 +54,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @@ -1264,18 +1264,19 @@ index 060becd4c0b7aa399496ad70ba28cb3449cfaea3..b72b3fdfad0be25f6ece6b934c47a748 public ServerCommonPacketListenerImpl(MinecraftServer server, Connection connection, CommonListenerCookie cookie, net.minecraft.server.level.ServerPlayer player) { // CraftBukkit this.server = server; -@@ -186,6 +187,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack - if (identifier.equals(MINECRAFT_BRAND)) { - this.player.clientBrandName = new net.minecraft.network.FriendlyByteBuf(io.netty.buffer.Unpooled.wrappedBuffer(data)).readUtf(256); +@@ -183,6 +184,12 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack + return; } + + // Purpur start - Purpur client support -+ else if (identifier.equals(PURPUR_CLIENT)) { ++ if (identifier.equals(PURPUR_CLIENT)) { + player.purpurClient = true; + } + // Purpur end - Purpur client support - - this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), identifier.toString(), data); - } catch (final Exception e) { ++ + if (identifier.equals(MINECRAFT_BRAND)) { + this.player.clientBrandName = new net.minecraft.network.FriendlyByteBuf(io.netty.buffer.Unpooled.wrappedBuffer(data)).readUtf(256); + } diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java index a3d0d331d367b8ddfd0ac450acd143ce7d3f7a9a..5fcd389b5483c4c11e7a007b2b6abb9abc1db6b2 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/leaf-server/minecraft-patches/features/0021-Leaves-Protocol-Core.patch b/leaf-server/minecraft-patches/features/0021-Leaves-Protocol-Core.patch index 7657a587..8dfbf88a 100644 --- a/leaf-server/minecraft-patches/features/0021-Leaves-Protocol-Core.patch +++ b/leaf-server/minecraft-patches/features/0021-Leaves-Protocol-Core.patch @@ -54,7 +54,7 @@ index 047a09cf4a2c32e714aacedeccb0928ef2c7dfa9..dddbb18992348fb7e8a6552423d13480 this.tickables.get(i).run(); } diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index b72b3fdfad0be25f6ece6b934c47a748509de5d6..3b15b80512834686ffa48b97d3e133d71bf27d82 100644 +index 921ad69b699f693e3dfc8d912b0f1a05d8f81743..285af1576d6bef09f094b7e990b5bcd6eafda71f 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -151,6 +151,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @@ -69,7 +69,7 @@ index b72b3fdfad0be25f6ece6b934c47a748509de5d6..3b15b80512834686ffa48b97d3e133d7 // Paper start if (packet.payload() instanceof net.minecraft.network.protocol.common.custom.BrandPayload(String brand)) { this.player.clientBrandName = brand; -@@ -209,6 +214,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -210,6 +215,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack final String channel = new String(data, from, length, java.nio.charset.StandardCharsets.US_ASCII); if (register) { this.getCraftPlayer().addChannel(channel); diff --git a/leaf-server/minecraft-patches/features/0047-Mirai-Configurable-chat-message-signatures.patch b/leaf-server/minecraft-patches/features/0047-Mirai-Configurable-chat-message-signatures.patch index a6c578d0..d8645eab 100644 --- a/leaf-server/minecraft-patches/features/0047-Mirai-Configurable-chat-message-signatures.patch +++ b/leaf-server/minecraft-patches/features/0047-Mirai-Configurable-chat-message-signatures.patch @@ -103,10 +103,10 @@ index 5151c24697ceb01b4728d7d3fda5fee31db682d7..d4048661575ebfaf128ba25da3658437 // Paper start - Add setting for proxy online mode status return properties.enforceSecureProfile diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 3b15b80512834686ffa48b97d3e133d71bf27d82..3a3a89cf5d8760256a5bcce4daddac668ecee1a9 100644 +index 285af1576d6bef09f094b7e990b5bcd6eafda71f..96b70c1384834a8e22925c8e2af85ab7606dde20 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -@@ -320,10 +320,30 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -321,10 +321,30 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack } public void send(Packet packet) {