fix io.netty.native.workdir path error
This commit is contained in:
parent
3e5fee1cfc
commit
85761d77a2
|
@ -183,7 +183,13 @@ public class DefaultLauncher extends Launcher {
|
|||
|
||||
configuration.put("${natives_directory}", "${natives_directory}");
|
||||
List<String> jvmArgs = Arguments.parseArguments(version.getArguments().map(Arguments::getJvm).orElseGet(this::getDefaultJVMArguments), configuration);
|
||||
res.addAll(jvmArgs.stream().filter(arg -> !arg.contains("-Djna.tmpdir=") && !arg.contains("-Dorg.lwjgl.system.SharedLibraryExtractPath=")).collect(Collectors.toList()));
|
||||
res.addAll(jvmArgs.stream().map(arg -> {
|
||||
String result = arg;
|
||||
if (arg.contains("-Dio.netty.native.workdir") || arg.contains("-Djna.tmpdir") || arg.contains("-Dorg.lwjgl.system.SharedLibraryExtractPath")) {
|
||||
result = arg.replace("${natives_directory}", FCLPath.CACHE_DIR);
|
||||
}
|
||||
return result;
|
||||
}).collect(Collectors.toList()));
|
||||
Arguments argumentsFromAuthInfo = authInfo.getLaunchArguments(options);
|
||||
if (argumentsFromAuthInfo != null && argumentsFromAuthInfo.getJvm() != null && !argumentsFromAuthInfo.getJvm().isEmpty())
|
||||
res.addAll(Arguments.parseArguments(argumentsFromAuthInfo.getJvm(), configuration));
|
||||
|
|
Loading…
Reference in New Issue