summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorHex <hex@hex.lc>2018-07-17 16:42:30 -0600
committermd_5 <git@md-5.net>2018-07-18 09:36:16 +1000
commitd480dc74e5a6693695166ab2d53e80616ff56bb5 (patch)
tree6068454d2f14d596d2cfe0453d69d8bb69560b71 /src/main/java
parenta71d06a0c8426f7d1d23f9e76ea6cdf47b666db5 (diff)
downloadcraftbukkit-d480dc74e5a6693695166ab2d53e80616ff56bb5.tar
craftbukkit-d480dc74e5a6693695166ab2d53e80616ff56bb5.tar.gz
craftbukkit-d480dc74e5a6693695166ab2d53e80616ff56bb5.tar.lz
craftbukkit-d480dc74e5a6693695166ab2d53e80616ff56bb5.tar.xz
craftbukkit-d480dc74e5a6693695166ab2d53e80616ff56bb5.zip
SPIGOT-4035: Enforce case-sensitivity for chat format code matching.
This maintains case-insensitivity for URL matching, and adds a unit test to verify correct conversion via CraftChatMessage.
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
index 9b62ed43..9193020f 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
+++ b/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)|((?:(?:https?):\\/\\/)?(?:[-\\w_\\.]{2,}\\.[a-z]{2,4}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " \\n]|$))))", Pattern.CASE_INSENSITIVE);
+ 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 final List<IChatBaseComponent> list = new ArrayList<IChatBaseComponent>();
private IChatBaseComponent currentChatComponent = new ChatComponentText("");