diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java index 7cb10056..d7c78cde 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java @@ -52,7 +52,7 @@ private Handshake readHandshake(HInput input, HOutput output) throws IOException if (magicNumber == Launcher.PROTOCOL_MAGIC_LEGACY - 1) { // Previous launcher protocol session = 0; legacy = true; - } else if (magicNumber == Launcher.PROTOCOL_MAGIC_LEGACY - 2) { // Previous launcher protocol + } else if (magicNumber == ServerSocketHandler.LEGACY_LAUNCHER_MAGIC) { // Previous launcher protocol session = 0; legacy = true; } else if (magicNumber == Launcher.PROTOCOL_MAGIC_LEGACY) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ServerSocketHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ServerSocketHandler.java index 7d62dc1b..1859a9c6 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ServerSocketHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ServerSocketHandler.java @@ -1,5 +1,6 @@ package ru.gravit.launchserver.socket; +import ru.gravit.launcher.Launcher; import ru.gravit.launcher.managers.GarbageManager; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.manangers.SessionManager; @@ -37,6 +38,7 @@ public interface Listener { public final SessionManager sessionManager; private final AtomicLong idCounter = new AtomicLong(0L); + public static int LEGACY_LAUNCHER_MAGIC = Launcher.PROTOCOL_MAGIC_LEGACY - 2; private volatile Listener listener; diff --git a/modules b/modules index 073b52f7..0e32128c 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 073b52f785527e01ca548fc56b71130b41ce648e +Subproject commit 0e32128c6c8f569d67eff4e94777c6b8ef696345