From aa91d89aaafd21f5196a250b3764c44050ebd990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Thu, 26 Dec 2013 05:19:11 +0100 Subject: Do not merge disabled jar mods. --- logic/LegacyUpdate.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'logic/LegacyUpdate.cpp') 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)) -- cgit v1.2.3