SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-02 07:36:51 +11:00
parent 0656fd7a23
commit 9a876418c1
8 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CraftBukkit-Patches/0068-Fix-links-in-chat.patch
View File

@@ -1,11 +1,11 @@
From 55f17d7a2a29d0d8f377748eedc53f6425253e7a Mon Sep 17 00:00:00 2001
From 4f2f1f5b626323a15226c3ac2791a11f732f19bb Mon Sep 17 00:00:00 2001
From: Thinkofdeath <purggames@gmail.com>
Date: Sun, 1 Dec 2013 10:33:55 +0000
Subject: [PATCH] Fix links in chat
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
index 2e163f2..7d1ad13 100644
index cc8e715..a786da9 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
@@ -3,11 +3,15 @@ package org.bukkit.craftbukkit.util;
@@ -32,8 +32,8 @@ index 2e163f2..7d1ad13 100644
private FromString(String message) {
if (message == null) {
@@ -37,6 +42,8 @@ public final class CraftChatMessage {
}
@@ -38,6 +43,8 @@ public final class CraftChatMessage {
list.add(currentChatComponent);
EnumChatFormat format = null;
+ Matcher matcher = url.matcher(message);
@@ -41,9 +41,9 @@ index 2e163f2..7d1ad13 100644
for (int i = 0; i < message.length(); i++) {
char currentChar = message.charAt(i);
@@ -76,6 +83,28 @@ public final class CraftChatMessage {
finishComponent();
@@ -78,6 +85,28 @@ public final class CraftChatMessage {
}
currentChatComponent = null;
} else {
+ if (currentChar == ' ' || i == message.length() - 1) {
+ Matcher urlMatcher = matcher.region(lastWord, i == message.length() - 1 ? message.length() : i);
@@ -62,7 +62,7 @@ index 2e163f2..7d1ad13 100644
+ appendNewComponent();
+ modifier.a((ChatClickable) null);
+ if (i == message.length() - 1) {
+ finishComponent();
+ appendNewComponent();
+ break;
+ }
+ }
@@ -71,5 +71,5 @@ index 2e163f2..7d1ad13 100644
}
}
--
1.8.4.msysgit.0
1.8.3.2