Do not merge disabled jar mods.

This commit is contained in:
Petr Mrázek 2013-12-26 05:19:11 +01:00
parent acf25d8a33
commit aa91d89aaa

View File

@ -423,6 +423,11 @@ void LegacyUpdate::ModTheJar()
for (int i = modList->size() - 1; i >= 0; i--) for (int i = modList->size() - 1; i >= 0; i--)
{ {
auto &mod = modList->operator[](i); auto &mod = modList->operator[](i);
// do not merge disabled mods.
if(!mod.enabled())
continue;
if (mod.type() == Mod::MOD_ZIPFILE) if (mod.type() == Mod::MOD_ZIPFILE)
{ {
if (!MergeZipFiles(&zipOut, mod.filename(), addedFiles, LegacyUpdate::KeepMetainf)) if (!MergeZipFiles(&zipOut, mod.filename(), addedFiles, LegacyUpdate::KeepMetainf))