diff --git a/src/main/java/com/diamante/serverlist/Main.java b/src/main/java/com/diamante/serverlist/Main.java index 2d687c2..174775f 100644 --- a/src/main/java/com/diamante/serverlist/Main.java +++ b/src/main/java/com/diamante/serverlist/Main.java @@ -118,7 +118,6 @@ public class Main { if (main.getMode() == Mode.Master) { main.createMasterServer(); - main.getServer().setMagicOverride(magicOverride); System.out.println("Master Server startup"); while (running.get() && main.getServer().isValid()) { main.getServer().await(); diff --git a/src/main/java/com/diamante/serverlist/MasterServer.java b/src/main/java/com/diamante/serverlist/MasterServer.java index 5be736b..752050d 100644 --- a/src/main/java/com/diamante/serverlist/MasterServer.java +++ b/src/main/java/com/diamante/serverlist/MasterServer.java @@ -37,8 +37,6 @@ public class MasterServer { private ServerSocket socket; - private boolean magicOverride; - private boolean valid; private final ServerList serverList; @@ -75,10 +73,6 @@ public class MasterServer { serverList.removeInactive(); - if (this.magicOverride) { - versionBE = 0; // Handled in serverList.createResponse - } - var toSend = serverList.createResponse(versionBE); try { @@ -164,10 +158,6 @@ public class MasterServer { } } - public void setMagicOverride(boolean magicOverride) { - this.magicOverride = magicOverride; - } - public void stop() { // Can happen if multiple instances are launched if (socket == null || socket.isClosed()) { diff --git a/src/main/java/com/diamante/serverlist/ServerList.java b/src/main/java/com/diamante/serverlist/ServerList.java index 2ed6a33..2f7f90c 100644 --- a/src/main/java/com/diamante/serverlist/ServerList.java +++ b/src/main/java/com/diamante/serverlist/ServerList.java @@ -104,7 +104,7 @@ public class ServerList { var server = it.next(); // Let's make sure we send the client only servers on the same version // 2023 Update: They changed the magic so add option to disable this check - if (server.getVersion() == version || version == 0) { + if (server.getVersion() == version) { try { // Let's flip the bytes of this one too var ipBE = server.getAddress().getAddress();