diff --git a/Launcher/source/client/ClientLauncher.java b/Launcher/source/client/ClientLauncher.java index 082c52e..b6f913d 100644 --- a/Launcher/source/client/ClientLauncher.java +++ b/Launcher/source/client/ClientLauncher.java @@ -119,8 +119,12 @@ args.add(jvmProperty("os.version", "10.0")); } + // Add classpath and main class Collections.addAll(args, profile.object.getJvmArgs()); + Version v = profile.object.getVersion(); + if (v.compareTo(Version.MC1132) >= 0 && JVMHelper.OS_TYPE == OS.MACOSX) + Collections.addAll(args, "-XstartOnFirstThread"); Collections.addAll(args, "-classpath", IOHelper.getCodeSource(ClientLauncher.class).toString(), ClientLauncher.class.getName()); args.add(paramsFile.toString()); // Add params file path to args @@ -285,10 +289,6 @@ Collections.addAll(args, "--versionType", "KJ-Launcher v" + Launcher.VERSION); } - // Fix `-XstartOnFirstThread` in MacOS - if (version.compareTo(Version.MC1132) >= 0 && JVMHelper.OS_TYPE == OS.MACOSX) - Collections.addAll(args, "-XstartOnFirstThread"); - // Add server args if (params.autoEnter) { @@ -479,4 +479,4 @@ } } -// Н@хуя это здесь? *facepam* +// Н@хуя это здесь? *facepam* И главное нахуя?