From 6fec76c07facd59c21fa9f743ec3dd755f883127 Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Sun, 6 Jan 2019 20:44:46 +0400 Subject: [PATCH] ClientLauncher fixes. --- .../java/ru/gravit/launcher/client/ClientLauncher.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java b/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java index f5126368..7ee61ac1 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java +++ b/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java @@ -335,16 +335,12 @@ public static Process launch( LogHelper.error(e); } }).start(); - // Resolve java bin and set permissions - LogHelper.debug("Resolving JVM binary"); - //Path javaBin = IOHelper.resolveJavaBin(jvmDir); checkJVMBitsAndVersion(); // Fill CLI arguments List args = new LinkedList<>(); boolean wrapper = isUsingWrapper(); - Path javaBin; - /*if (wrapper) javaBin = AvanguardStarter.wrapper; - else*/ + LogHelper.debug("Resolving JVM binary"); + Path javaBin = null; if (isDownloadJava) { //Linux и Mac не должны скачивать свою JVM if (JVMHelper.OS_TYPE == OS.MUSTDIE)