lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix proxy options are passed to game even it's disabled

Browse Source
This commit is contained in:
yushijinhun
2018-12-16 16:03:29 +08:00
parent 9f060be3fd
commit 70f0393bde
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java
View File

@@ -528,7 +528,7 @@ public final class VersionSetting {
public LaunchOptions toLaunchOptions(File gameDir) throws InterruptedException { public LaunchOptions toLaunchOptions(File gameDir) throws InterruptedException {
JavaVersion javaVersion = Optional.ofNullable(getJavaVersion()).orElse(JavaVersion.fromCurrentEnvironment()); JavaVersion javaVersion = Optional.ofNullable(getJavaVersion()).orElse(JavaVersion.fromCurrentEnvironment());
return new LaunchOptions.Builder() LaunchOptions.Builder builder = new LaunchOptions.Builder()
.setGameDir(gameDir) .setGameDir(gameDir)
.setJava(javaVersion) .setJava(javaVersion)
.setVersionName(Metadata.TITLE) .setVersionName(Metadata.TITLE)
@@ -543,13 +543,17 @@ public final class VersionSetting {
.setFullscreen(isFullscreen()) .setFullscreen(isFullscreen())
.setServerIp(getServerIp()) .setServerIp(getServerIp())
.setWrapper(getWrapper()) .setWrapper(getWrapper())
.setProxyHost(config().getProxyHost())
.setProxyPort(config().getProxyPort())
.setProxyUser(config().getProxyUser())
.setProxyPass(config().getProxyPass())
.setPrecalledCommand(getPreLaunchCommand()) .setPrecalledCommand(getPreLaunchCommand())
.setNoGeneratedJVMArgs(isNoJVMArgs()) .setNoGeneratedJVMArgs(isNoJVMArgs());
.create(); if (config().hasProxy()) {
builder.setProxyHost(config().getProxyHost());
builder.setProxyPort(config().getProxyPort());
if (config().hasProxyAuth()) {
builder.setProxyUser(config().getProxyUser());
builder.setProxyPass(config().getProxyPass());
}
}
return builder.create();
} }
public static class Serializer implements JsonSerializer<VersionSetting>, JsonDeserializer<VersionSetting> { public static class Serializer implements JsonSerializer<VersionSetting>, JsonDeserializer<VersionSetting> {