From 9335e2907b47a72938710ae75d00f34f2be242ef Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Sat, 21 Feb 2015 19:48:48 -0800 Subject: [PATCH] Fix NPEs in mlast commit. --- .../net/minecraftforge/fml/common/FMLModContainer.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fml/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java b/fml/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java index 1b6bb1914..a3f06f25e 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java @@ -613,11 +613,17 @@ public class FMLModContainer implements ModContainer return candidate.getContainedPackages(); } + private boolean isTrue(Boolean value) + { + if (value == null) return false; + return value.booleanValue(); + } + @Override public boolean shouldLoadInEnvironment() { - boolean clientSideOnly = (Boolean)this.descriptor.get("clientSideOnly"); - boolean serverSideOnly = (Boolean)this.descriptor.get("serverSideOnly"); + boolean clientSideOnly = isTrue((Boolean)descriptor.get("clientSideOnly")); + boolean serverSideOnly = isTrue((Boolean)descriptor.get("serverSideOnly")); if (clientSideOnly && serverSideOnly) throw new RuntimeException("Mod annotation claims to be both client and server side only!");