From 543eaa4f667b02a57f56944a3becd03d2d8a83c7 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Fri, 17 Aug 2018 21:52:35 +0800 Subject: [PATCH] Force cancel using custom log4j config --- .../org/jackhuang/hmcl/launch/DefaultLauncher.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java index 5f2817320..90e6d418c 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java @@ -258,7 +258,7 @@ public class DefaultLauncher extends Launcher { File nativeFolder = Files.createTempDirectory("minecraft").toFile(); // To guarantee that when failed to generate launch command line, we will not call pre-launch command - List rawCommandLine = generateCommandLine(nativeFolder, true).asList(); + List rawCommandLine = generateCommandLine(nativeFolder, isEnablingLoggingInfo()).asList(); decompressNatives(nativeFolder); @@ -316,14 +316,17 @@ public class DefaultLauncher extends Launcher { throw new PermissionException(); } + protected boolean isEnablingLoggingInfo() { + return version.getLogging() != null && version.getLogging().containsKey(DownloadType.CLIENT) + && !"net.minecraft.launchwrapper.Launch".equals(version.getMainClass()); + } + private void startMonitors(ManagedProcess managedProcess, ProcessListener processListener) { startMonitors(managedProcess, processListener, true); } private void startMonitors(ManagedProcess managedProcess, ProcessListener processListener, boolean isDaemon) { - boolean enablesLoggingInfo = version.getLogging() != null && version.getLogging().containsKey(DownloadType.CLIENT) - && !"net.minecraft.launchwrapper.Launch".equals(version.getMainClass()); - if (enablesLoggingInfo) + if (isEnablingLoggingInfo()) startMonitorsWithLoggingInfo(managedProcess, processListener, isDaemon); else startMonitorsWithoutLoggingInfo(managedProcess, processListener, isDaemon);