From 4fe0bf419523ec4191528761cd72b714ef5ca323 Mon Sep 17 00:00:00 2001 From: Gravit Date: Sat, 23 Mar 2019 11:30:47 +0700 Subject: [PATCH] =?UTF-8?q?[FEATURE]=20=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5?= =?UTF-8?q?=D1=80=D0=B6=D0=BA=D0=B0=20=D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BA=D0=B0=D1=81=D1=82=D0=BE=D0=BC=D0=BD=D0=BE?= =?UTF-8?q?=D0=B9=20=D0=BC=D0=B0=D0=B3=D0=B8=D0=B8=20=D0=BB=D0=B0=D1=83?= =?UTF-8?q?=D0=BD=D1=87=D0=B5=D1=80=D0=B0=20=D1=81=D0=B0=D1=88=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/ru/gravit/launchserver/socket/ResponseThread.java | 2 +- .../java/ru/gravit/launchserver/socket/ServerSocketHandler.java | 2 ++ modules | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) 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