From b71caeb81324eff4562aeecc6d97cd2ba5ba0ea3 Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 10 Apr 2018 19:17:27 -0700 Subject: [PATCH] Fix mods without ModSide meta value. --- .../java/net/minecraftforge/fml/relauncher/CoreModManager.java | 2 +- .../minecraftforge/fml/relauncher/libraries/LibraryManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java b/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java index b673a1ac4e..cb64d02e39 100644 --- a/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java +++ b/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java @@ -364,7 +364,7 @@ public class CoreModManager { continue; String modSide = mfAttributes.getValue(LibraryManager.MODSIDE); - if (!"BOTH".equals(modSide) || FMLLaunchHandler.side().name().equals(modSide)) + if (modSide != null && !"BOTH".equals(modSide) && !FMLLaunchHandler.side().name().equals(modSide)) { FMLLog.log.debug("Mod {} has ModSide meta-inf value {}, and we're {} It will be ignored", coreMod.getName(), modSide, FMLLaunchHandler.side.name()); ignoredModFiles.add(coreMod.getName()); diff --git a/src/main/java/net/minecraftforge/fml/relauncher/libraries/LibraryManager.java b/src/main/java/net/minecraftforge/fml/relauncher/libraries/LibraryManager.java index 1359ff01ed..3aed4602dd 100644 --- a/src/main/java/net/minecraftforge/fml/relauncher/libraries/LibraryManager.java +++ b/src/main/java/net/minecraftforge/fml/relauncher/libraries/LibraryManager.java @@ -220,7 +220,7 @@ public class LibraryManager attrs = jar.getManifest().getMainAttributes(); String modSide = attrs.getValue(LibraryManager.MODSIDE); - if (!"BOTH".equals(modSide) || FMLLaunchHandler.side().name().equals(modSide)) + if (modSide != null && !"BOTH".equals(modSide) && !FMLLaunchHandler.side().name().equals(modSide)) return null; if (attrs.containsKey(MODCONTAINSDEPS))