mirror of
https://github.com/PaperMC/Paper.git
synced 2025-03-13 11:18:23 +01:00
Send event-defined MOTD/maxplayers. Fixes BUKKIT-4409
Also, revert to previous CraftBukkit functionality
This commit is contained in:
parent
905f00b070
commit
a15096ae1c
1 changed files with 11 additions and 8 deletions
|
@ -150,18 +150,21 @@ public class PendingConnection extends Connection {
|
|||
// CraftBukkit
|
||||
s = pingEvent.getMotd() + "\u00A7" + playerlist.getPlayerCount() + "\u00A7" + pingEvent.getMaxPlayers();
|
||||
} else {
|
||||
List list = Arrays.asList(new Serializable[] { Integer.valueOf(1), Integer.valueOf(73), this.server.getVersion(), this.server.getMotd(), Integer.valueOf(playerlist.getPlayerCount()), Integer.valueOf(playerlist.getMaxPlayers())});
|
||||
// CraftBukkit start - Don't create a list from an array
|
||||
Object[] list = new Object[] { 1, 73, this.server.getVersion(), pingEvent.getMotd(), playerlist.getPlayerCount(), pingEvent.getMaxPlayers() };
|
||||
|
||||
Object object;
|
||||
|
||||
for (Iterator iterator = list.iterator(); iterator.hasNext(); s = s + object.toString().replaceAll("\0", "")) {
|
||||
object = iterator.next();
|
||||
if (s == null) {
|
||||
s = "\u00A7";
|
||||
StringBuilder builder = new StringBuilder();
|
||||
for (Object object : list) {
|
||||
if (builder.length() == 0) {
|
||||
builder.append('\u00A7');
|
||||
} else {
|
||||
s = s + '\0';
|
||||
builder.append('\0');
|
||||
}
|
||||
|
||||
builder.append(org.apache.commons.lang.StringUtils.replace(object.toString(), "\0", ""));
|
||||
}
|
||||
s = builder.toString();
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
InetAddress inetaddress = null;
|
||||
|
|
Loading…
Add table
Reference in a new issue