From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: wea_ondara <wea_ondara@alpenblock.net>
Date: Sat, 2 Nov 2019 22:25:40 +0100
Subject: [PATCH] Fix serialization of colors from components

This patch fixes the serialization of display names, item lores and
other things which use strings with color codes. The old implementation
deleted the color codes at the beginning of the resulting string if it
matched the default color passed to the conversion function. This
resulted in items having a black display name losing the black color
code in the beginning of the text when the item was serialized (e.g.
saving an ItemStack in a Yaml config).

Spigot has now made the issue worse and expanded the scope to more places.

diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
@@ -0,0 +0,0 @@ public final class CraftChatMessage {
                 case 1:
                     EnumChatFormat format = formatMap.get(match.toLowerCase(java.util.Locale.ENGLISH).charAt(1));
                     if (format == EnumChatFormat.RESET) {
-                        modifier = new ChatModifier();
+                        modifier = new ChatModifier().setColor(format); // Paper
                     } else if (format.isFormat()) {
                         switch (format) {
                         case BOLD:
@@ -0,0 +0,0 @@ public final class CraftChatMessage {
         if (component == null) return "";
         StringBuilder out = new StringBuilder();
 
+        // Paper start - fix deletion of color codes at the beginning of result string
+        boolean first = true;
         for (IChatBaseComponent c : (Iterable<IChatBaseComponent>) component) {
             ChatModifier modi = c.getChatModifier();
-            out.append(modi.getColor() == null ? defaultColor : modi.getColor());
+            EnumChatFormat color = modi.getColor();
+            if (first) {
+                if (color != null) {
+                    out.append(color);
+                }
+                if (!c.getText().isEmpty() || color != null) {
+                    first = false;
+                }
+            } else if (!c.getText().isEmpty() || color != null) {
+                if (color != null) {
+                    out.append(color);
+                } else if (defaultColor != null) {
+                    out.append(defaultColor);
+                }
+            }
+            // Paper end
             if (modi.isBold()) {
                 out.append(EnumChatFormat.BOLD);
             }
@@ -0,0 +0,0 @@ public final class CraftChatMessage {
             }
             out.append(c.getText());
         }
-        return out.toString().replaceFirst("^(" + defaultColor + ")*", "");
+        return out.toString(); // Paper - fix deletion of color codes at the beginning of result string
     }
 
     public static IChatBaseComponent fixComponent(IChatBaseComponent component) {
diff --git a/src/test/java/org/bukkit/craftbukkit/CraftChatMessageTest.java b/src/test/java/org/bukkit/craftbukkit/CraftChatMessageTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
+++ b/src/test/java/org/bukkit/craftbukkit/CraftChatMessageTest.java
@@ -0,0 +0,0 @@
+package org.bukkit.craftbukkit;
+
+import net.minecraft.server.EnumChatFormat;
+import net.minecraft.server.IChatBaseComponent;
+import org.bukkit.ChatColor;
+import org.bukkit.craftbukkit.util.CraftChatMessage;
+import org.bukkit.support.AbstractTestingBase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class CraftChatMessageTest extends AbstractTestingBase {
+    @Test
+    public void testSimpleStrings() {
+        testString("&fFoo", EnumChatFormat.WHITE);
+        testString("Foo", EnumChatFormat.WHITE);
+        testString("Foo&bBar", EnumChatFormat.WHITE);
+        testString("Foo&bBar", EnumChatFormat.AQUA);
+        testString("&fFoo&bBar", EnumChatFormat.WHITE);
+        testString("&rFoo", EnumChatFormat.WHITE);
+    }
+
+    @Test
+    public void testComponents() {
+        testComponent("Foo&bBar&fBaz", EnumChatFormat.WHITE, create("Foo", "&bBar", "Baz"));
+        testComponent("&fFoo&bBar&fBaz", EnumChatFormat.WHITE, create("", "&fFoo", "&bBar", "Baz"));
+        testComponent("Foo&bBar&fBaz", EnumChatFormat.WHITE, create("", "Foo", "&bBar", "Baz"));
+        testComponent("&fFoo&bBar&fBaz", EnumChatFormat.WHITE, create("&fFoo", "&bBar", "Baz"));
+        testComponent("F&foo&bBar&fBaz", EnumChatFormat.WHITE, create("F&foo", "&bBar", "Baz"));
+    }
+
+    private IChatBaseComponent create(String txt, String ...rest) {
+        IChatBaseComponent cmp = toComp(txt);
+        for (String s : rest) {
+            cmp.addSibling(toComp(s));
+        }
+
+        return cmp;
+    }
+
+    private IChatBaseComponent toComp(String txt) {
+        return CraftChatMessage.fromString(ChatColor.translateAlternateColorCodes('&', txt))[0];
+    }
+
+    private void testString(String expected, EnumChatFormat defColor) {
+        expected = ChatColor.translateAlternateColorCodes('&', expected);
+        IChatBaseComponent cmp = CraftChatMessage.fromStringOrNull(expected);
+        testComponent(expected, defColor, cmp);
+    }
+
+    private void testComponent(String expected, EnumChatFormat defColor, IChatBaseComponent components) {
+        expected = ChatColor.translateAlternateColorCodes('&', expected);
+        String actual = CraftChatMessage.fromComponent(components, defColor);
+        assertEquals(expected, actual);
+    }
+}