aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0391-Improve-Legacy-Component-serialization-size.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0391-Improve-Legacy-Component-serialization-size.patch')
-rw-r--r--patches/server/0391-Improve-Legacy-Component-serialization-size.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/patches/server/0391-Improve-Legacy-Component-serialization-size.patch b/patches/server/0391-Improve-Legacy-Component-serialization-size.patch
new file mode 100644
index 0000000000..00450d094b
--- /dev/null
+++ b/patches/server/0391-Improve-Legacy-Component-serialization-size.patch
@@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Sun, 28 Jun 2020 19:08:41 -0400
+Subject: [PATCH] Improve Legacy Component serialization size
+
+Don't constantly send format: false for all formatting options when parent already
+has it false
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
+index 516b3fef4d388366df09f0dd88deadbcc0b7d344..753200057e74b8e2d5274894b982e6ee946a559e 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
+@@ -46,6 +46,7 @@ public final class CraftChatMessage {
+ // Separate pattern with no group 3, new lines are part of previous string
+ private static final Pattern INCREMENTAL_PATTERN_KEEP_NEWLINES = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-orx])|((?:(?:https?):\\/\\/)?(?:[-\\w_\\.]{2,}\\.[a-z]{2,4}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " ]|$))))", Pattern.CASE_INSENSITIVE);
+ // ChatColor.b does not explicitly reset, its more of empty
++ private static final Style EMPTY = Style.EMPTY.withItalic(false); // Paper - Improve Legacy Component serialization size
+ private static final Style RESET = Style.EMPTY.withBold(false).withItalic(false).withUnderlined(false).withStrikethrough(false).withObfuscated(false);
+
+ private final List<Component> list = new ArrayList<Component>();
+@@ -67,6 +68,7 @@ public final class CraftChatMessage {
+ Matcher matcher = (keepNewlines ? StringMessage.INCREMENTAL_PATTERN_KEEP_NEWLINES : StringMessage.INCREMENTAL_PATTERN).matcher(message);
+ String match = null;
+ boolean needsAdd = false;
++ boolean hasReset = false; // Paper - Improve Legacy Component serialization size
+ while (matcher.find()) {
+ int groupId = 0;
+ while ((match = matcher.group(++groupId)) == null) {
+@@ -112,7 +114,26 @@ public final class CraftChatMessage {
+ throw new AssertionError("Unexpected message format");
+ }
+ } else { // Color resets formatting
+- this.modifier = StringMessage.RESET.withColor(format);
++ // Paper start - Improve Legacy Component serialization size
++ Style previous = modifier;
++ modifier = (!hasReset ? RESET : EMPTY).withColor(format);
++ hasReset = true;
++ if (previous.isBold()) {
++ modifier = modifier.withBold(false);
++ }
++ if (previous.isItalic()) {
++ modifier = modifier.withItalic(false);
++ }
++ if (previous.isObfuscated()) {
++ modifier = modifier.withObfuscated(false);
++ }
++ if (previous.isStrikethrough()) {
++ modifier = modifier.withStrikethrough(false);
++ }
++ if (previous.isUnderlined()) {
++ modifier = modifier.withUnderlined(false);
++ }
++ // Paper end - Improve Legacy Component serialization size
+ }
+ needsAdd = true;
+ break;