Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-11-30 14:13:47 +01:00
Code Issues Projects Releases Wiki Activity

Update ChatConverter

Browse Source
This commit is contained in:
Thinkofdeath 2013-12-02 11:47:05 +00:00 committed by md_5
parent 18db187347
commit 81e43aab98
4 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/src/main/java/net/md_5/bungee/BungeeCord.java
View File

@ -488,7 +488,9 @@ public class BungeeCord extends ProxyServer
{ {
getConsole().sendMessage( message ); getConsole().sendMessage( message );
// TODO: Here too // TODO: Here too
broadcast( new Chat( ChatConverter.toJSONChat( message ) ) ); for (String msg : ChatConverter.toJSONChat( message )) {
broadcast( new Chat( msg ) );
}
} }
public void addConnection(UserConnection con) public void addConnection(UserConnection con)

33
proxy/src/main/java/net/md_5/bungee/ChatConverter.java
View File

@ -14,9 +14,10 @@ public class ChatConverter {
private static final char COLOR_CHAR = '\u00A7'; private static final char COLOR_CHAR = '\u00A7';
private static final Pattern url = Pattern.compile("^(?:(https?)://)?([-\\w_\\.]{2,}\\.[a-z]{2,4})(/\\S*)?$"); private static final Pattern url = Pattern.compile("^(?:(https?)://)?([-\\w_\\.]{2,}\\.[a-z]{2,4})(/\\S*)?$");
public static String toJSONChat(String txt) { public static String[] toJSONChat(String txt) {
Message msg = new Message(); Message msg = new Message();
ArrayList<Message> parts = new ArrayList<Message>(); ArrayList<String> parts = new ArrayList<String>();
StringBuilder outBuffer = new StringBuilder("[");
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
Matcher matcher = url.matcher(txt); Matcher matcher = url.matcher(txt);
for (int i = 0; i < txt.length(); i++) { for (int i = 0; i < txt.length(); i++) {
@ -27,7 +28,7 @@ public class ChatConverter {
if (matcher.region(i, pos).find()) { //Web link handling if (matcher.region(i, pos).find()) { //Web link handling
msg.text = buf.toString(); msg.text = buf.toString();
buf = new StringBuilder(); buf = new StringBuilder();
parts.add(msg); outBuffer = append(parts, outBuffer, msg);
Message old = msg; Message old = msg;
msg = new Message(old); msg = new Message(old);
msg.clickEvent = new ClickEvent(); msg.clickEvent = new ClickEvent();
@ -39,7 +40,7 @@ public class ChatConverter {
msg.text = urlString; msg.text = urlString;
msg.clickEvent.value = "http://" + urlString; msg.clickEvent.value = "http://" + urlString;
} }
parts.add(msg); outBuffer = append(parts, outBuffer, msg);
i += pos - i - 1; i += pos - i - 1;
msg = new Message(old); msg = new Message(old);
continue; continue;
@ -54,7 +55,7 @@ public class ChatConverter {
} }
msg.text = buf.toString(); msg.text = buf.toString();
buf = new StringBuilder(); buf = new StringBuilder();
parts.add(msg); outBuffer = append(parts, outBuffer, msg);
msg = new Message(msg); msg = new Message(msg);
switch(c) { switch(c) {
case 'k': case 'k':
@ -87,8 +88,26 @@ public class ChatConverter {
} }
} }
msg.text = buf.toString(); msg.text = buf.toString();
parts.add(msg); append(parts, outBuffer, msg);
return gson.toJson(parts);
parts.add(outBuffer.append("]").toString());
String[] pArray = new String[parts.size()];
parts.toArray(pArray);
return pArray;
}
private static StringBuilder append(ArrayList<String> parts, StringBuilder outBuffer, Message part) {
String p = gson.toJson(part);
if (p.length() + outBuffer.length() + 1 >= Short.MAX_VALUE - 20) {
outBuffer.append("]");
parts.add(outBuffer.toString());
outBuffer = new StringBuilder("[");
}
if (outBuffer.length() != 1) {
outBuffer.append(",");
}
outBuffer.append(p);
return outBuffer;
} }
} }

6
proxy/src/main/java/net/md_5/bungee/UserConnection.java
View File

@ -256,7 +256,7 @@ public final class UserConnection implements ProxiedPlayer
@Override @Override
public synchronized void disconnect(String reason) public synchronized void disconnect(String reason)
{ {
disconnect0( ChatConverter.toJSONChat( reason ) ); disconnect0( ChatConverter.toJSONChat( reason )[0] );
} }
public synchronized void disconnect0(String reason) public synchronized void disconnect0(String reason)
@ -283,7 +283,9 @@ public final class UserConnection implements ProxiedPlayer
@Override @Override
public void sendMessage(String message) public void sendMessage(String message)
{ {
unsafe().sendPacket( new Chat( ChatConverter.toJSONChat( message ) ) ); for(String msg : ChatConverter.toJSONChat( message )) {
unsafe().sendPacket( new Chat( msg ) );
}
} }
@Override @Override

2
proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
View File

@ -397,7 +397,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{ {
if ( !ch.isClosed() ) if ( !ch.isClosed() )
{ {
unsafe().sendPacket( new Kick( ChatConverter.toJSONChat( reason ) ) ); unsafe().sendPacket( new Kick( ChatConverter.toJSONChat( reason )[0] ) );
ch.close(); ch.close();
} }
} }