aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform
diff options
context:
space:
mode:
Diffstat (limited to 'launcher/modplatform')
-rw-r--r--launcher/modplatform/flame/FlameInstanceCreationTask.cpp3
-rw-r--r--launcher/modplatform/modpacksch/FTBPackInstallTask.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index eae66ec7..729268d7 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -406,6 +406,7 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
blocked_mod.hash = result.hash;
blocked_mod.matched = false;
blocked_mod.localPath = "";
+ blocked_mod.targetFolder = result.targetFolder;
blocked_mods.append(blocked_mod);
@@ -451,7 +452,7 @@ void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
continue;
}
- auto dest_path = FS::PathCombine(m_stagingPath, "minecraft", "mods", mod.name);
+ auto dest_path = FS::PathCombine(m_stagingPath, "minecraft", mod.targetFolder, mod.name);
setStatus(tr("Copying Blocked Mods (%1 out of %2 are done)").arg(QString::number(i), QString::number(total)));
diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
index 48caa938..2979663d 100644
--- a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
+++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
@@ -195,6 +195,7 @@ void PackInstallTask::onResolveModsSucceeded()
blocked_mod.hash = results_file.hash;
blocked_mod.matched = false;
blocked_mod.localPath = "";
+ blocked_mod.targetFolder = results_file.targetFolder;
m_blocked_mods.append(blocked_mod);
@@ -366,7 +367,7 @@ void PackInstallTask::copyBlockedMods()
continue;
}
- auto dest_path = FS::PathCombine(m_stagingPath, ".minecraft", "mods", mod.name);
+ auto dest_path = FS::PathCombine(m_stagingPath, ".minecraft", mod.targetFolder, mod.name);
setStatus(tr("Copying Blocked Mods (%1 out of %2 are done)").arg(QString::number(i), QString::number(total)));