From ffe622e0b930b01ceb0fb13f1beb296c3bbb07a9 Mon Sep 17 00:00:00 2001 From: sanik2021 Date: Mon, 16 Sep 2019 20:18:01 +0300 Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B2?= =?UTF-8?q?=D0=BE=D0=B5=D0=B9=20Java=20=D1=81=20GravitGuard=20=D0=B8=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0=20GravitGuard=20?= =?UTF-8?q?=D0=BD=D0=B0=20Linux=20=D0=B8=20MacOS.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/pro/gravit/launcher/guard/LauncherGravitGuard.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherGravitGuard.java b/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherGravitGuard.java index 6552a68a..27378118 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherGravitGuard.java +++ b/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherGravitGuard.java @@ -29,10 +29,6 @@ public String getName() { @Override public Path getJavaBinPath() { if (JVMHelper.OS_TYPE == JVMHelper.OS.MUSTDIE) { - String projectName = Launcher.getConfig().projectname; - String wrapperUnpackName = JVMHelper.JVM_BITS == 64 ? projectName.concat("64.exe") : projectName.concat("32.exe"); - return DirBridge.getGuardDir().resolve(wrapperUnpackName); - } else if (ClientLauncher.getJavaBinPath() != null) { javaBinPath = ClientLauncher.getJavaBinPath(); String projectName = Launcher.getConfig().projectname; String wrapperUnpackName = JVMHelper.JVM_BITS == 64 ? projectName.concat("64.exe") : projectName.concat("32.exe"); @@ -58,7 +54,7 @@ public void init(boolean clientInstance) { } catch (IOException e) { throw new SecurityException(e); } - if (clientInstance) GravitGuardBridge.callGuard(); + if (clientInstance && JVMHelper.OS_TYPE == JVMHelper.OS.MUSTDIE) GravitGuardBridge.callGuard(); } @Override