From c808225f7810a3948054408a9eab62ebe2a392db Mon Sep 17 00:00:00 2001 From: ZekerZhayard Date: Sun, 20 Mar 2022 19:40:15 +0800 Subject: [PATCH] Fix #1405 --- .../org/jackhuang/hmcl/game/VersionLibraryBuilder.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/VersionLibraryBuilder.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/VersionLibraryBuilder.java index 144a8b1b3..5169e4d40 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/VersionLibraryBuilder.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/VersionLibraryBuilder.java @@ -51,11 +51,12 @@ public final class VersionLibraryBuilder { // Since $ will be escaped in linux, and our maintain of minecraftArgument will not cause escaping, // so we regenerate the minecraftArgument without escaping. ret = ret.setMinecraftArguments(new CommandBuilder().addAllWithoutParsing(mcArgs).toString()); + } else { + ret = ret.setArguments(ret.getArguments() + .map(args -> args.withGame(game)) + .map(args -> jvmChanged ? args.withJvm(jvm) : args).orElse(new Arguments(game, jvmChanged ? jvm : null))); } - return ret.setArguments(ret.getArguments() - .map(args -> args.withGame(game)) - .map(args -> jvmChanged ? args.withJvm(jvm) : args).orElse(new Arguments(game, jvmChanged ? jvm : null))) - .setLibraries(libraries); + return ret.setLibraries(libraries); } public boolean hasTweakClass(String tweakClass) {