Upstream/HolographicDisplays
1
0
Fork 0
mirror of https://github.com/filoghost/HolographicDisplays.git synced 2025-03-25 21:09:40 +01:00
Code Issues Projects Releases Wiki Activity

Small refactoring

Browse Source
This commit is contained in:
filoghost 2021-06-21 23:33:40 +02:00
parent 37cc961cab
commit 95fd02b507
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/pinger/PingResponse.java
View File

@ -17,17 +17,21 @@ public class PingResponse {
private final int onlinePlayers;
private final int maxPlayers;
private PingResponse(String motd, int onlinePlayers, int maxPlayers) {
this.motd = motd;
this.onlinePlayers = onlinePlayers;
this.maxPlayers = maxPlayers;
}
protected static PingResponse fromJson(String jsonString, ServerAddress address) {
if (jsonString == null || jsonString.isEmpty()) {
logInvalidResponse(jsonString, address);
return errorResponse("Invalid ping response (null or empty)");
return errorResponse("Invalid ping response (null or empty)", jsonString, address);
}
Object jsonObject = JSONValue.parse(jsonString);
if (!(jsonObject instanceof JSONObject)) {
logInvalidResponse(jsonString, address);
return errorResponse("Invalid ping response (wrong format)");
return errorResponse("Invalid ping response (wrong format)", jsonString, address);
}
JSONObject json = (JSONObject) jsonObject;
@ -39,8 +43,7 @@ public class PingResponse {
int maxPlayers = 0;
if (descriptionObject == null) {
logInvalidResponse(jsonString, address);
return errorResponse("Invalid ping response (description not found)");
return errorResponse("Invalid ping response (description not found)", jsonString, address);
}
if (descriptionObject instanceof JSONObject) {
@ -48,8 +51,7 @@ public class PingResponse {
try {
motd = ComponentSerializer.parse(descriptionString)[0].toLegacyText();
} catch (Exception e) {
logInvalidResponse(jsonString, address);
return errorResponse("Invalid ping response (could not parse description)");
return errorResponse("Invalid ping response (could not parse description)", jsonString, address);
}
} else {
motd = descriptionObject.toString();
@ -74,20 +76,11 @@ public class PingResponse {
return new PingResponse(motd, onlinePlayers, maxPlayers);
}
private static void logInvalidResponse(String responseJsonString, ServerAddress address) {
DebugLogger.warning("Received invalid JSON response from IP \"" + address + "\": " + responseJsonString);
}
private static PingResponse errorResponse(String error) {
private static PingResponse errorResponse(String error, String jsonString, ServerAddress address) {
DebugLogger.warning("Received invalid JSON response from IP \"" + address + "\": " + jsonString);
return new PingResponse(error, 0, 0);
}
private PingResponse(String motd, int onlinePlayers, int maxPlayers) {
this.motd = motd;
this.onlinePlayers = onlinePlayers;
this.maxPlayers = maxPlayers;
}
public String getMotd() {
return motd;
}