From 9de739723f7c072f99dae7aba539ca21c79097af Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 16 Jul 2013 10:32:29 -0700 Subject: [PATCH] Fix potential NPE in villager skin registry. --- fml/common/cpw/mods/fml/common/registry/VillagerRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml/common/cpw/mods/fml/common/registry/VillagerRegistry.java b/fml/common/cpw/mods/fml/common/registry/VillagerRegistry.java index 63c1d0f70a..bc13f07f62 100644 --- a/fml/common/cpw/mods/fml/common/registry/VillagerRegistry.java +++ b/fml/common/cpw/mods/fml/common/registry/VillagerRegistry.java @@ -173,7 +173,7 @@ public class VillagerRegistry @SideOnly(Side.CLIENT) public static ResourceLocation getVillagerSkin(int villagerType, ResourceLocation defaultSkin) { - if (instance().newVillagers.containsKey(villagerType)) + if (instance().newVillagers != null && instance().newVillagers.containsKey(villagerType)) { return instance().newVillagers.get(villagerType); }