Don't display {"text":"..."} for MOTD in Minecraft 1.9+

This commit is contained in:
filoghost 2016-11-21 21:23:01 +01:00
parent f291bf31e4
commit 0dc0b7303c

View File

@ -43,9 +43,18 @@ public class PingResponse
Object descriptionObject = json.get("description"); Object descriptionObject = json.get("description");
if (descriptionObject != null) { if (descriptionObject != null) {
motd = descriptionObject.toString(); if (descriptionObject instanceof JSONObject) {
Object text = ((JSONObject) descriptionObject).get("text");
if (text != null) {
motd = text.toString();
} else { } else {
motd = "Invalid ping response"; motd = "Invalid ping response (text not found)";
}
} else {
motd = descriptionObject.toString();
}
} else {
motd = "Invalid ping response (description not found)";
DebugHandler.logToConsole("Received invalid Json response from IP \"" + address.toString() + "\": " + jsonString); DebugHandler.logToConsole("Received invalid Json response from IP \"" + address.toString() + "\": " + jsonString);
} }