From 96a6fbb359346f39fd4dd08e8d9b5c88d9501f8a Mon Sep 17 00:00:00 2001
From: Zaxar163 <zahar.vcherachny@yandex.ru>
Date: Fri, 11 Oct 2019 07:31:29 +0200
Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=92=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB?=
 =?UTF-8?q?=D1=8F=D0=BC=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C,=20=D0=B7=D0=B0=D0=BF=D1=83=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=BB=D0=B8=20=D0=BE=D0=BD=D0=B8=20=D0=BF=D0=BE=D1=81?=
 =?UTF-8?q?=D0=BB=D0=B5=20=D1=81=D1=82=D0=B0=D1=80=D1=82=D0=B0=20=D0=BA?=
 =?UTF-8?q?=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java | 1 +
 .../main/java/pro/gravit/launcher/client/ClientLauncher.java   | 3 +--
 modules                                                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java b/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java
index a1556111..6d131792 100644
--- a/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java
+++ b/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java
@@ -28,6 +28,7 @@
 import pro.gravit.utils.helper.LogHelper;
 
 public class LauncherEngine {
+	public static final AtomicBoolean IS_CLIENT = new AtomicBoolean(false);
 
     public static void main(String... args) throws Throwable {
         JVMHelper.checkStackTrace(LauncherEngine.class);
diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java
index 9173eecf..15e74934 100644
--- a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java
+++ b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java
@@ -443,13 +443,12 @@ public ClientLaunchContext(Params params, ClientProfile profile, HashedDir asset
 
     @LauncherAPI
     public static void main(String... args) throws Throwable {
+    	LauncherEngine.IS_CLIENT.set(true);
         LauncherEngine engine = LauncherEngine.clientInstance();
-        //Launcher.modulesManager = new ClientModuleManager(engine);
         LauncherEngine.modulesManager = new ClientModuleManager();
         LauncherConfig.getAutogenConfig().initModules(); //INIT
         LauncherEngine.modulesManager.initModules(null);
         initGson(LauncherEngine.modulesManager);
-        //Launcher.modulesManager.preInitModules();
         if (!LauncherAgent.isStarted()) {
         	NativeJVMHalt.haltA(100);
         	return;
diff --git a/modules b/modules
index 42f29101..a4cf6a2f 160000
--- a/modules
+++ b/modules
@@ -1 +1 @@
-Subproject commit 42f29101e441d85b15920b9657c447e08cf6af73
+Subproject commit a4cf6a2f71892f65ef6202d1c254a073f2d7ca6f