From 5f2a9eadde3aa899b554a1c8a65e6ae2e86af98e Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 13 Dec 2014 09:36:35 +0000 Subject: SPIGOT-199: Default to white instead of black for chat messages --- src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java index 844bf6a7..c3f27f1f 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java @@ -131,12 +131,16 @@ public final class CraftChatMessage { } public static String fromComponent(IChatBaseComponent component) { + return fromComponent(component, EnumChatFormat.BLACK); + } + + public static String fromComponent(IChatBaseComponent component, EnumChatFormat defaultColor) { if (component == null) return ""; StringBuilder out = new StringBuilder(); for (IChatBaseComponent c : (Iterable) component) { ChatModifier modi = c.getChatModifier(); - out.append(modi.getColor() == null ? EnumChatFormat.BLACK : modi.getColor()); + out.append(modi.getColor() == null ? defaultColor : modi.getColor()); if (modi.isBold()) { out.append(EnumChatFormat.BOLD); } @@ -154,7 +158,7 @@ public final class CraftChatMessage { } out.append(c.getText()); } - return out.toString().replaceFirst("^(ยง0)*", ""); + return out.toString().replaceFirst("^(" + defaultColor + ")*", ""); } private CraftChatMessage() { -- cgit v1.2.3