2009Scape/2009Scape-mobile
1
0
Fork 0
mirror of https://github.com/2009scape/2009Scape-mobile.git synced 2025-12-18 12:30:11 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fix internal errors

Browse source
This commit is contained in:
khanhduytran0 2020-11-15 09:49:27 +07:00
parent a33dcfaf9f
commit d46abbe040
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/net/kdt/pojavlaunch/Tools.java
View file

@ -186,17 +186,19 @@ public final class Tools
if (arg instanceof String) {
minecraftArgs.add((String) arg);
} else {
/*
JMinecraftVersionList.Arguments.ArgValue argv = (JMinecraftVersionList.Arguments.ArgValue) arg;
if (argv.values != null) {
minecraftArgs.add(argv.values[0]);
} else {
/*
for (JMinecraftVersionList.Arguments.ArgValue.ArgRules rule : arg.rules) {
// rule.action = allow
// TODO implement this
}
*/
}
*/
}
}
}
@ -571,13 +573,14 @@ public final class Tools
}
}
}
if (customVer.inheritsFrom == null) {
if (customVer.inheritsFrom == null || customVer.inheritsFrom.isEmpty()) {
return customVer;
} else {
JMinecraftVersionList.Version inheritsVer = new Gson().fromJson(read(versnDir + "/" + customVer.inheritsFrom + "/" + customVer.inheritsFrom + ".json"), JMinecraftVersionList.Version.class);
inheritsVer.inheritsFrom = "";
insertSafety(inheritsVer, customVer,
"assetIndex", "assets",
"assetIndex", "assets", "id",
"mainClass", "minecraftArguments",
"optifineLib", "releaseTime", "time", "type"
);