aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Mansfield <jmansfield@cadixdev.org>2022-05-01 18:12:21 +0100
committerJamie Mansfield <jmansfield@cadixdev.org>2022-05-20 17:58:00 +0100
commit97a83c9b7a72d37218acfbf5c325245eab0b5b23 (patch)
treed6daae3dd955bbb2678a3c33bdc69fe2a9f5c96d
parent1e6df7eec0b2d8f93dd7e0c81ba53eaafba0ec4d (diff)
downloadPrismLauncher-97a83c9b7a72d37218acfbf5c325245eab0b5b23.tar.gz
PrismLauncher-97a83c9b7a72d37218acfbf5c325245eab0b5b23.tar.bz2
PrismLauncher-97a83c9b7a72d37218acfbf5c325245eab0b5b23.zip
ATLauncher: Avoid downloading Forge twice for older packs
This resolves a quirk where Forge would still be downloaded for use as a jarmod, even when we detected Forge as a component.
-rw-r--r--launcher/modplatform/atlauncher/ATLPackInstallTask.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index 9dcb3504..991d737c 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -574,8 +574,6 @@ void PackInstallTask::downloadMods()
jobPtr->addNetAction(dl);
auto path = FS::PathCombine(m_stagingPath, "minecraft", relpath, mod.file);
- qDebug() << "Will download" << url << "to" << path;
- modsToCopy[entry->getFullPath()] = path;
if(mod.type == ModType::Forge) {
auto vlist = APPLICATION->metadataIndex()->get("net.minecraftforge");
@@ -597,6 +595,10 @@ void PackInstallTask::downloadMods()
qDebug() << "Jarmod: " + path;
jarmods.push_back(path);
}
+
+ // Download after Forge handling, to avoid downloading Forge twice.
+ qDebug() << "Will download" << url << "to" << path;
+ modsToCopy[entry->getFullPath()] = path;
}
}