From dd0c251b3d4b2058d35456a1a7e85b3ebc160449 Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Thu, 16 Aug 2018 20:54:56 +0200 Subject: [PATCH] Fix ModList cache never being updated (#5081) --- .../fml/relauncher/libraries/LibraryManager.java | 5 ++++- .../net/minecraftforge/fml/relauncher/libraries/ModList.java | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/relauncher/libraries/LibraryManager.java b/src/main/java/net/minecraftforge/fml/relauncher/libraries/LibraryManager.java index ef4d229167..c7e2bc3a63 100644 --- a/src/main/java/net/minecraftforge/fml/relauncher/libraries/LibraryManager.java +++ b/src/main/java/net/minecraftforge/fml/relauncher/libraries/LibraryManager.java @@ -99,8 +99,11 @@ public class LibraryManager for (ModList list : ModList.getKnownLists(minecraftHome)) { Repository repo = list.getRepository() == null ? libraries_dir : list.getRepository(); - for (Artifact artifact : list.getArtifacts()) + List artifacts = list.getArtifacts(); + // extractPacked adds artifacts to the list. As such, we can't use an Iterator to traverse it. + for (int i = 0; i < artifacts.size(); i++) { + Artifact artifact = artifacts.get(i); Artifact resolved = repo.resolve(artifact); if (resolved != null) { diff --git a/src/main/java/net/minecraftforge/fml/relauncher/libraries/ModList.java b/src/main/java/net/minecraftforge/fml/relauncher/libraries/ModList.java index 0791d4dfc1..2d12d1b119 100644 --- a/src/main/java/net/minecraftforge/fml/relauncher/libraries/ModList.java +++ b/src/main/java/net/minecraftforge/fml/relauncher/libraries/ModList.java @@ -50,8 +50,7 @@ public class ModList try { String key = json.getCanonicalFile().getAbsolutePath(); - if (cache.containsKey(key)) - return cache.get(key); + return cache.computeIfAbsent(key, k -> new ModList(json, mcdir)); } catch (IOException e) {