19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
42 lines
2.2 KiB
Diff
42 lines
2.2 KiB
Diff
From fc8066aa363f20a5c37f8789294943d7f56e16a1 Mon Sep 17 00:00:00 2001
|
|
From: Thinkofdeath <thethinkofdeath@gmail.com>
|
|
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 844bf6a..0481688 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;
|
|
public final class CraftChatMessage {
|
|
private static class StringMessage {
|
|
private static final Map<Character, EnumChatFormat> 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}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " \\n]|$))))", Pattern.CASE_INSENSITIVE);
|
|
|
|
static {
|
|
Builder<Character, EnumChatFormat> builder = ImmutableMap.builder();
|
|
@@ -89,6 +89,9 @@ public final class CraftChatMessage {
|
|
}
|
|
break;
|
|
case 3:
|
|
+ if ( !( match.startsWith( "http://" ) || match.startsWith( "https://" ) ) ) {
|
|
+ match = "http://" + match;
|
|
+ }
|
|
modifier.setChatClickable(new ChatClickable(EnumClickAction.OPEN_URL, match));
|
|
appendNewComponent(matcher.end(groupId));
|
|
modifier.setChatClickable((ChatClickable) null);
|
|
@@ -100,7 +103,7 @@ public final class CraftChatMessage {
|
|
appendNewComponent(message.length());
|
|
}
|
|
|
|
- output = list.toArray(new IChatBaseComponent[0]);
|
|
+ output = list.toArray(new IChatBaseComponent[list.size()]);
|
|
}
|
|
|
|
private void appendNewComponent(int index) {
|
|
--
|
|
2.1.0
|
|
|