From 090836273851e5605b3504b80534e3b20c5f0f14 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 18 Apr 2014 19:27:20 +0000 Subject: [PATCH] Treat color codes as an end of a url --- CraftBukkit-Patches/0090-Support-non-prefixed-URLs.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CraftBukkit-Patches/0090-Support-non-prefixed-URLs.patch b/CraftBukkit-Patches/0090-Support-non-prefixed-URLs.patch index d115f4d256..b4a0a54db2 100644 --- a/CraftBukkit-Patches/0090-Support-non-prefixed-URLs.patch +++ b/CraftBukkit-Patches/0090-Support-non-prefixed-URLs.patch @@ -1,11 +1,11 @@ -From aee9dd47382b1bdbe781004dce9da712593a0b0d Mon Sep 17 00:00:00 2001 +From 60d13067607d49b8e4b3709249f2bfb0ea81c5f2 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 18 Jan 2014 19:32:42 +0000 Subject: [PATCH] Support non-prefixed URLs diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java -index 2b57bf8..a3de612 100644 +index 2b57bf8..ce2c6bb 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java @@ -19,7 +19,7 @@ import com.google.common.collect.ImmutableMap.Builder; @@ -13,7 +13,7 @@ index 2b57bf8..a3de612 100644 private static class StringMessage { private static final Map formatMap; - private static final Pattern INCREMENTAL_PATTERN = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-or])|(\\n)|(?:(https?://[^ ][^ ]*?)(?=[\\.\\?!,;:]?(?:[ \\n]|$)))", Pattern.CASE_INSENSITIVE); -+ 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}.*?(?=[\\.\\?!,;:]?(?:[ \\n]|$))))", Pattern.CASE_INSENSITIVE); ++ 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); static { Builder builder = ImmutableMap.builder(); @@ -37,5 +37,5 @@ index 2b57bf8..a3de612 100644 private void appendNewComponent(int index) { -- -1.8.3.2 +1.9.1