testserver/patches/server/0065-Don-t-nest-if-we-don-t...

36 lines
1.8 KiB
Diff
Raw Normal View History

2022-06-07 19:15:06 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Tue, 8 Mar 2016 18:28:43 -0800
Subject: [PATCH] Don't nest if we don't need to when cerealising text
components
diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
2022-07-27 19:18:51 +00:00
index b0052398d7ff954c2a7943ea4618d26f45d701da..50b691fd4086a9b049c83936abfee9ae0414837d 100644
2022-06-07 19:15:06 +00:00
--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
2022-07-27 19:18:51 +00:00
@@ -13,7 +13,7 @@ public record ClientboundSystemChatPacket(@javax.annotation.Nullable net.kyori.a
2022-06-07 19:15:06 +00:00
}
2022-07-27 19:18:51 +00:00
public ClientboundSystemChatPacket(net.md_5.bungee.api.chat.BaseComponent[] content, boolean overlay) {
- this(null, net.md_5.bungee.chat.ComponentSerializer.toString(content), overlay); // Paper - Adventure
+ this(null, improveBungeeComponentSerialization(content), overlay); // Paper - Adventure
2022-06-07 23:49:14 +00:00
}
// Spigot end
// Paper start
2022-07-27 19:18:51 +00:00
@@ -24,6 +24,14 @@ public record ClientboundSystemChatPacket(@javax.annotation.Nullable net.kyori.a
public ClientboundSystemChatPacket(net.kyori.adventure.text.Component content, boolean overlay) {
this(content, null, overlay);
2022-06-07 23:49:14 +00:00
}
2022-06-07 19:15:06 +00:00
+
2022-06-07 23:49:14 +00:00
+ private static String improveBungeeComponentSerialization(net.md_5.bungee.api.chat.BaseComponent[] content) {
2022-06-07 19:15:06 +00:00
+ if (content.length == 1) {
+ return net.md_5.bungee.chat.ComponentSerializer.toString(content[0]);
+ } else {
+ return net.md_5.bungee.chat.ComponentSerializer.toString(content);
+ }
2022-06-07 23:49:14 +00:00
+ }
2022-06-07 19:15:06 +00:00
// Paper end
2022-06-07 23:49:14 +00:00
public ClientboundSystemChatPacket(FriendlyByteBuf buf) {