Fix potential race condition and fix non-coremod deletion

Author: thejudge156

src/main/java/pojlib/API.java

@@ -240,19 +240,20 @@ public static void login(Activity activity, @Nullable String accountUUID)
 
         MinecraftAccount acc = MinecraftAccount.load(activity.getFilesDir() + "/accounts", accountUUID);
         if(acc != null && (acc.expiresOn >= System.currentTimeMillis() || !hasConnection(activity) || acc.isDemoMode)) {
+            API.profileImage = MinecraftAccount.getSkinFaceUrl(acc);
+            API.profileName = acc.username;
+            API.profileUUID = acc.uuid;
+            API.isDemoMode = acc.isDemoMode;
             currentAcc = acc;
-            API.profileImage = MinecraftAccount.getSkinFaceUrl(API.currentAcc);
-            API.profileName = API.currentAcc.username;
-            API.profileUUID = API.currentAcc.uuid;
-            API.isDemoMode = API.currentAcc.isDemoMode;
             return;
         } else if(acc != null && acc.expiresOn < System.currentTimeMillis()) {
-            currentAcc = LoginHelper.refreshAccount(activity, accountUUID);
-            if(currentAcc != null) {
-                API.profileImage = MinecraftAccount.getSkinFaceUrl(API.currentAcc);
-                API.profileName = API.currentAcc.username;
-                API.profileUUID = API.currentAcc.uuid;
-                API.isDemoMode = API.currentAcc.isDemoMode;
+            MinecraftAccount refreshed = LoginHelper.refreshAccount(activity, accountUUID);
+            if(refreshed != null) {
+                API.profileImage = MinecraftAccount.getSkinFaceUrl(refreshed);
+                API.profileName = refreshed.username;
+                API.profileUUID = refreshed.uuid;
+                API.isDemoMode = refreshed.isDemoMode;
+                currentAcc = refreshed;
                 return;
             }
         }

src/main/java/pojlib/InstanceHandler.java

@@ -262,13 +262,11 @@ private static boolean isCoreMod(MinecraftInstances.Instance instance, ProjectIn
         // Check if its a coremod
         ModsJson oldMods = instance.parseModsJson(Constants.USER_HOME + "/mods.json");
         if(oldMods != null) {
-            Optional<ModsJson.Version> ver = Arrays.stream(oldMods.versions).filter((v) -> !v.name.equals(instance.versionName)).findFirst();
+            Optional<ModsJson.Version> ver = Arrays.stream(oldMods.versions).filter((v) -> v.name.equals(instance.versionName)).findFirst();
             if(ver.isPresent()) {
                 ModsJson.Version version = ver.get();
-                Optional<ProjectInfo> info = Arrays.stream(version.coreMods).filter((mod) -> !mod.slug.equals(oldInfo.slug)).findFirst();
-                if(info.isPresent()) {
-                    return true;
-                }
+                Optional<ProjectInfo> info = Arrays.stream(version.coreMods).filter((mod) -> mod.slug.equals(oldInfo.slug)).findFirst();
+                return info.isPresent();
             }
         }