Improve query

CloudburstMC · Jun 12, 2019 · 17c36d2 · 17c36d2
1 parent df64e2d
commit 17c36d2
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/src/main/java/org/itxtech/nemisys/network/RakNetInterface.java b/src/main/java/org/itxtech/nemisys/network/RakNetInterface.java
@@ -22,6 +22,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
+import java.util.StringJoiner;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -194,15 +195,22 @@ public void notifyACK(String identifier, int identifierACK) {
     public void setName(String name) {
         QueryRegenerateEvent info = this.server.getQueryInformation();
 
-        this.handler.sendOption("name",
-                "MCPE;" + Utils.rtrim(name.replace(";", "\\;"), '\\') + ";" +
-                        ProtocolInfo.CURRENT_PROTOCOL + ";" +
-                        ProtocolInfo.MINECRAFT_VERSION_NETWORK + ";" +
-                        info.getPlayerCount() + ";" +
-                        info.getMaxPlayerCount() + ";" +
-                        server.getServerUniqueId().toString() +
-                        "" + ";" +
-                        "" + ";");
+        String[] names = name.split("!@#");
+        String motd = Utils.rtrim(names[0].replace(";", "\\;"), '\\');
+        String subMotd = names.length > 1 ? Utils.rtrim(names[1].replace(";", "\\;"), '\\') : "";
+        StringJoiner joiner = new StringJoiner(";")
+                .add("MCPE")
+                .add(motd)
+                .add(Integer.toString(ProtocolInfo.CURRENT_PROTOCOL))
+                .add(ProtocolInfo.MINECRAFT_VERSION_NETWORK)
+                .add(Integer.toString(info.getPlayerCount()))
+                .add(Integer.toString(info.getMaxPlayerCount()))
+                .add(server.getServerUniqueId().toString())
+                .add(subMotd)
+                .add("Survival")
+                .add("1");
+
+        this.handler.sendOption("name", joiner.toString());
     }
 
     public void setPortCheck(boolean value) {