From a2a1e72a787f85e390db192db8749188ccd22a1b Mon Sep 17 00:00:00 2001 From: Gravit Date: Sat, 13 Apr 2019 03:51:15 +0700 Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20api.js?= =?UTF-8?q?,=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=BE=D0=B2=20=D1=81?= =?UTF-8?q?=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=20gradle=20=D0=B8=20=D0=B3=D0=B5?= =?UTF-8?q?=D0=BD=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D1=84=D0=B8=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/ru/gravit/launchserver/LaunchServer.java | 3 +++ Launcher/build.gradle | 1 + Launcher/runtime/engine/api.js | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java index 722fb3b8..5a0f00b2 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java @@ -709,6 +709,9 @@ private void generateConfigIfNotExists(boolean testEnv) throws IOException { newConfig.netty.performance.bossThread = 2; newConfig.netty.performance.workerThread = 8; + newConfig.launcher = new LauncherConf(); + newConfig.launcher.guardType = "no"; + newConfig.threadCoreCount = 0; // on your own newConfig.threadCount = JVMHelper.OPERATING_SYSTEM_MXBEAN.getAvailableProcessors() >= 4 ? JVMHelper.OPERATING_SYSTEM_MXBEAN.getAvailableProcessors() / 2 : JVMHelper.OPERATING_SYSTEM_MXBEAN.getAvailableProcessors(); diff --git a/Launcher/build.gradle b/Launcher/build.gradle index 11fa5a06..12715480 100644 --- a/Launcher/build.gradle +++ b/Launcher/build.gradle @@ -38,6 +38,7 @@ pack project(':LauncherAPI') // Not error on obf. bundle 'com.github.oshi:oshi-core:3.13.0' bundle 'com.jfoenix:jfoenix:8.0.8' + bundle 'de.jensd:fontawesomefx:8.9' pack 'org.ow2.asm:asm-tree:7.1' } diff --git a/Launcher/runtime/engine/api.js b/Launcher/runtime/engine/api.js index b29fc735..603fd8b4 100644 --- a/Launcher/runtime/engine/api.js +++ b/Launcher/runtime/engine/api.js @@ -17,7 +17,7 @@ var ServerPinger = ServerPingerClass.static; var Request = RequestClass.static; var RequestType = RequestTypeClass.static; var RequestException = RequestExceptionClass.static; -var PingRequest = PingRequestClass.static; +//var PingRequest = PingRequestClass.static; var AuthRequest = AuthRequestClass.static; var JoinServerRequest = JoinServerRequestClass.static; var CheckServerRequest = CheckServerRequestClass.static;