aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorkumquat-ir <66188216+kumquat-ir@users.noreply.github.com>2023-02-16 12:57:35 -0500
committerkumquat-ir <66188216+kumquat-ir@users.noreply.github.com>2023-02-16 12:57:35 -0500
commit256fc322a8decfd113ea73bf61ec15ce31a6f474 (patch)
tree0c9ef33ff444c346afdb500cf72da1289ab0d668 /launcher
parent9c2a3231c5ee1b15b09bae9b064827ad3dcb86e0 (diff)
downloadPrismLauncher-256fc322a8decfd113ea73bf61ec15ce31a6f474.tar.gz
PrismLauncher-256fc322a8decfd113ea73bf61ec15ce31a6f474.tar.bz2
PrismLauncher-256fc322a8decfd113ea73bf61ec15ce31a6f474.zip
minor cleanup
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
Diffstat (limited to 'launcher')
-rw-r--r--launcher/minecraft/mod/tasks/LocalModParseTask.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
index 2263f8ec..945ccda7 100644
--- a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
@@ -434,17 +434,12 @@ bool processZIP(Mod& mod, ProcessingLevel level)
QStringList foundNilMetas;
for (auto& fname : zip.getFileNameList()) {
- if (fname.endsWith(".nilmod.css")) {
+ // nilmods can shade nilloader to be able to run as a standalone agent - which includes nilloader's own meta file
+ if (fname.endsWith(".nilmod.css") && fname != "nilloader.nilmod.css") {
foundNilMetas.append(fname);
}
}
- if (foundNilMetas.size() > 1 && foundNilMetas.at(0) == "nilloader.nilmod.css") {
- // nilmods can shade nilloader to be able to run as a standalone agent - which includes nilloader's own meta file
- // so if there is more than one meta file, ignore nilloader's meta, since it's not the actual mod
- foundNilMetas.removeFirst();
- }
-
if (zip.setCurrentFile(foundNilMetas.at(0))) {
if (!file.open(QIODevice::ReadOnly)) {
zip.close();