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

Revert "fix: Version.jar should be resolved to id of self if null instead of the id of ancestor.". Closes #934.

Browse Source 
This reverts commit 5de150b06e.
This commit is contained in:
Yuhui Huang
2021-07-28 16:15:11 +08:00
parent 0d69e944f6
commit 5f8f01e0ab
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,7 +163,7 @@ public class Version implements Comparable<Version>, Validation {
}
public String getJar() {
return jar == null ? id : jar;
return jar;
}
public String getInheritsFrom() {
@@ -275,14 +275,14 @@ public class Version implements Comparable<Version>, Validation {
if (inheritsFrom == null) {
if (isRoot())
thisVersion = new Version(id).setPatches(patches);
thisVersion = new Version(id).setPatches(patches).setJar(id);
else
thisVersion = this;
thisVersion = this.jar == null ? this.setJar(id) : this;
} else {
// To maximize the compatibility.
if (!resolvedSoFar.add(id)) {
Logging.LOG.log(Level.WARNING, "Found circular dependency versions: " + resolvedSoFar);
thisVersion = this;
thisVersion = this.jar == null ? this.setJar(id) : this;
} else {
// It is supposed to auto install an version in getVersion.
thisVersion = merge(provider.getVersion(inheritsFrom).resolve(provider, resolvedSoFar), false);