diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-26 05:19:11 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-26 05:19:11 +0100 |
| commit | aa91d89aaafd21f5196a250b3764c44050ebd990 (patch) | |
| tree | 40ad91ba4b6797affb52e7f6b852186d0433f516 /logic/LegacyUpdate.cpp | |
| parent | acf25d8a33ef67b79d8e8a8859f5559e011373a5 (diff) | |
| download | MultiMC-aa91d89aaafd21f5196a250b3764c44050ebd990.tar MultiMC-aa91d89aaafd21f5196a250b3764c44050ebd990.tar.gz MultiMC-aa91d89aaafd21f5196a250b3764c44050ebd990.tar.lz MultiMC-aa91d89aaafd21f5196a250b3764c44050ebd990.tar.xz MultiMC-aa91d89aaafd21f5196a250b3764c44050ebd990.zip | |
Do not merge disabled jar mods.
Diffstat (limited to 'logic/LegacyUpdate.cpp')
| -rw-r--r-- | logic/LegacyUpdate.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/logic/LegacyUpdate.cpp b/logic/LegacyUpdate.cpp index fb9dcf2b..cb3598a7 100644 --- a/logic/LegacyUpdate.cpp +++ b/logic/LegacyUpdate.cpp @@ -423,6 +423,11 @@ void LegacyUpdate::ModTheJar() for (int i = modList->size() - 1; i >= 0; i--) { auto &mod = modList->operator[](i); + + // do not merge disabled mods. + if(!mod.enabled()) + continue; + if (mod.type() == Mod::MOD_ZIPFILE) { if (!MergeZipFiles(&zipOut, mod.filename(), addedFiles, LegacyUpdate::KeepMetainf)) |