diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-13 09:36:35 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-13 09:37:47 +0000 |
| commit | 5f2a9eadde3aa899b554a1c8a65e6ae2e86af98e (patch) | |
| tree | 3bb6512886dd3e734e08203871f859a9681db8a9 | |
| parent | e8efbb8a8762fed89dcb31f78f97693b55bfb2bc (diff) | |
| download | craftbukkit-5f2a9eadde3aa899b554a1c8a65e6ae2e86af98e.tar craftbukkit-5f2a9eadde3aa899b554a1c8a65e6ae2e86af98e.tar.gz craftbukkit-5f2a9eadde3aa899b554a1c8a65e6ae2e86af98e.tar.lz craftbukkit-5f2a9eadde3aa899b554a1c8a65e6ae2e86af98e.tar.xz craftbukkit-5f2a9eadde3aa899b554a1c8a65e6ae2e86af98e.zip | |
SPIGOT-199: Default to white instead of black for chat messages
| -rw-r--r-- | nms-patches/PlayerList.patch | 6 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/nms-patches/PlayerList.patch b/nms-patches/PlayerList.patch index a3fcd0ff..11e3e49c 100644 --- a/nms-patches/PlayerList.patch +++ b/nms-patches/PlayerList.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde/net/minecraft/server/PlayerList.java 2014-12-12 21:45:59.845822542 +0000 -+++ src/main/java/net/minecraft/server/PlayerList.java 2014-12-12 21:44:44.381823361 +0000 +--- ../work/decompile-8eb82bde/net/minecraft/server/PlayerList.java 2014-12-13 09:37:43.506950406 +0000 ++++ src/main/java/net/minecraft/server/PlayerList.java 2014-12-13 09:35:13.993746030 +0000 @@ -18,6 +18,26 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -820,7 +820,7 @@ - this.sendAll(new PacketPlayOutChat(ichatbasecomponent, (byte) i)); + // CraftBukkit start - we run this through our processor first so we can get web links etc + // PAIL: Rename -+ for (IChatBaseComponent component : CraftChatMessage.fromString(CraftChatMessage.fromComponent(ichatbasecomponent))) { ++ for (IChatBaseComponent component : CraftChatMessage.fromString(CraftChatMessage.fromComponent(ichatbasecomponent, EnumChatFormat.WHITE))) { + this.sendAll(new PacketPlayOutChat(component, (byte) i)); + } + // CraftBukkit end 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<IChatBaseComponent>) 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() { |