From 39de92187ef2e98cc334578d0298f0a8a5fce896 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Thu, 19 Jul 2018 10:07:04 +1000 Subject: [PATCH] Revert "SPIGOT-4035: Enforce case-sensitivity for chat format code matching." Minecraft allows uppercase colour codes. This reverts commit 844204b34528a355756a5499f19b9e8e98469148. By: md_5 --- .../org/bukkit/craftbukkit/util/CraftChatMessage.java | 2 +- paper-server/src/test/java/org/bukkit/ChatTest.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java index 9193020f8..9b62ed436 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java @@ -40,7 +40,7 @@ public final class CraftChatMessage { } private static class StringMessage { - private static final Pattern INCREMENTAL_PATTERN = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-or])|(\\n)|(?i)((?:(?:https?):\\/\\/)?(?:[-\\w_\\.]{2,}\\.[a-z]{2,4}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " \\n]|$))))"); + private static final Pattern INCREMENTAL_PATTERN = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-or])|(\\n)|((?:(?:https?):\\/\\/)?(?:[-\\w_\\.]{2,}\\.[a-z]{2,4}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " \\n]|$))))", Pattern.CASE_INSENSITIVE); private final List list = new ArrayList(); private IChatBaseComponent currentChatComponent = new ChatComponentText(""); diff --git a/paper-server/src/test/java/org/bukkit/ChatTest.java b/paper-server/src/test/java/org/bukkit/ChatTest.java index 0aa60d61c..97467c26f 100644 --- a/paper-server/src/test/java/org/bukkit/ChatTest.java +++ b/paper-server/src/test/java/org/bukkit/ChatTest.java @@ -23,14 +23,6 @@ public class ChatTest { } } - @Test - public void testColorConversion() { - String test = String.format("%1$sA%1$sa%1$sB%1$sb%1$sC%1$sc%1$sD%1$sd%1$sE%1$se%1$sZ%1$sz%1$s", ChatColor.COLOR_CHAR); - IChatBaseComponent name = CraftChatMessage.fromStringOrNull(test); - assertEquals(test.replace(String.valueOf(ChatColor.COLOR_CHAR), ""), - CraftChatMessage.fromComponent(name).replace(String.valueOf(ChatColor.COLOR_CHAR), "")); - } - @Test public void testURLJsonConversion() { IChatBaseComponent[] components;