TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-14 07:05:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Another attempt to fix Forge crash

Browse Source
This commit is contained in:
khanhduytran0 2020-09-12 15:45:33 +07:00
parent b7e9b6a80f
commit 3055f41e59
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@ -621,7 +621,7 @@ public final class Tools
totalArgList.addAll(Arrays.asList(inheritsVer.arguments.game)); totalArgList.addAll(Arrays.asList(inheritsVer.arguments.game));
totalArgList.addAll(Arrays.asList(customVer.arguments.game)); totalArgList.addAll(Arrays.asList(customVer.arguments.game));
customVer.arguments.game = totalArgList.toArray(new Object[0]); inheritsVer.arguments.game = totalArgList.toArray(new Object[0]);
} }
return inheritsVer; return inheritsVer;
@ -638,7 +638,7 @@ public final class Tools
try { try {
Field fieldA = fromVer.getClass().getDeclaredField(key); Field fieldA = fromVer.getClass().getDeclaredField(key);
value = fieldA.get(fromVer); value = fieldA.get(fromVer);
if (value != null || ((value instanceof String) && !((String) value).isEmpty())) { if (((value instanceof String) && !((String) value).isEmpty()) || value != null) {
Field fieldB = targetVer.getClass().getDeclaredField(key); Field fieldB = targetVer.getClass().getDeclaredField(key);
fieldB.set(targetVer, value); fieldB.set(targetVer, value);
} }