Future/ServerList
1
0
Fork 0
mirror of https://github.com/diamante0018/ServerList.git synced 2025-04-21 03:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

maint: undo last change

Browse Source
This commit is contained in:
6arelyFuture 2023-02-15 22:49:41 +00:00
parent 11befb154e
commit 430f367330
No known key found for this signature in database
GPG Key ID: 22F9079C86CFAB31
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/diamante/serverlist/Main.java
View File

@ -118,7 +118,6 @@ public class Main {
if (main.getMode() == Mode.Master) { if (main.getMode() == Mode.Master) {
main.createMasterServer(); main.createMasterServer();
main.getServer().setMagicOverride(magicOverride);
System.out.println("Master Server startup"); System.out.println("Master Server startup");
while (running.get() && main.getServer().isValid()) { while (running.get() && main.getServer().isValid()) {
main.getServer().await(); main.getServer().await();

10
src/main/java/com/diamante/serverlist/MasterServer.java
View File

@ -37,8 +37,6 @@ public class MasterServer {
private ServerSocket socket; private ServerSocket socket;
private boolean magicOverride;
private boolean valid; private boolean valid;
private final ServerList serverList; private final ServerList serverList;
@ -75,10 +73,6 @@ public class MasterServer {
serverList.removeInactive(); serverList.removeInactive();
if (this.magicOverride) {
versionBE = 0; // Handled in serverList.createResponse
}
var toSend = serverList.createResponse(versionBE); var toSend = serverList.createResponse(versionBE);
try { try {
@ -164,10 +158,6 @@ public class MasterServer {
} }
} }
public void setMagicOverride(boolean magicOverride) {
this.magicOverride = magicOverride;
}
public void stop() { public void stop() {
// Can happen if multiple instances are launched // Can happen if multiple instances are launched
if (socket == null || socket.isClosed()) { if (socket == null || socket.isClosed()) {

2
src/main/java/com/diamante/serverlist/ServerList.java
View File

@ -104,7 +104,7 @@ public class ServerList {
var server = it.next(); var server = it.next();
// Let's make sure we send the client only servers on the same version // 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 // 2023 Update: They changed the magic so add option to disable this check
if (server.getVersion() == version || version == 0) { if (server.getVersion() == version) {
try { try {
// Let's flip the bytes of this one too // Let's flip the bytes of this one too
var ipBE = server.getAddress().getAddress(); var ipBE = server.getAddress().getAddress();