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

fix: Version.jar becomes wrong value after resolvePreservingPatches

Browse Source
This commit is contained in:
huanghongxun
2021-07-31 02:01:17 +08:00
parent 6f40335322
commit e5cca24740
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
HMCLCore/src/main/java/org/jackhuang/hmcl/game/Version.java
View File

@@ -274,10 +274,12 @@ public class Version implements Comparable<Version>, Validation {
Version thisVersion; Version thisVersion;
if (inheritsFrom == null) { if (inheritsFrom == null) {
if (isRoot()) if (isRoot()) {
thisVersion = new Version(id).setPatches(patches).setJar(id); thisVersion = new Version(id).setPatches(patches);
else } else {
thisVersion = this.jar == null ? this.setJar(id) : this; thisVersion = this;
}
thisVersion = this.jar == null ? thisVersion.setJar(id) : thisVersion.setJar(this.jar);
} else { } else {
// To maximize the compatibility. // To maximize the compatibility.
if (!resolvedSoFar.add(id)) { if (!resolvedSoFar.add(id)) {
@@ -333,7 +335,7 @@ public class Version implements Comparable<Version>, Validation {
} }
} }
return thisVersion.setId(id); return thisVersion.setId(id).setJar(resolve(provider).getJar());
} }
private Version markAsResolved() { private Version markAsResolved() {