From 3055f41e5988d77a9947356079940a2474cf077f Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Sat, 12 Sep 2020 15:45:33 +0700 Subject: [PATCH] Another attempt to fix Forge crash --- app/src/main/java/net/kdt/pojavlaunch/Tools.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java index eb1eb5af2..6120a8e6e 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -621,7 +621,7 @@ public final class Tools totalArgList.addAll(Arrays.asList(inheritsVer.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; @@ -638,7 +638,7 @@ public final class Tools try { Field fieldA = fromVer.getClass().getDeclaredField(key); 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); fieldB.set(targetVer, value); }