From cc593f39399c24c0de7ed2a4d054b8457715e951 Mon Sep 17 00:00:00 2001 From: cpw Date: Thu, 23 Jun 2016 09:29:03 -0400 Subject: [PATCH] Accept more 1.9.4 version strings. Fix NPE for custom villager types and their associated zombie spawns. Still needs review. --- .../java/net/minecraftforge/fml/common/FMLModContainer.java | 2 +- .../minecraftforge/fml/common/registry/VillagerRegistry.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java b/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java index c38db80d24..b1fe94e11b 100644 --- a/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java +++ b/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java @@ -225,7 +225,7 @@ public class FMLModContainer implements ModContainer String mcVersionString = (String)descriptor.get("acceptedMinecraftVersions"); if ("[1.8.8]".equals(mcVersionString)) mcVersionString = "[1.8.8,1.8.9]"; // MC 1.8.8 and 1.8.9 is forward SRG compatible so accept these versions by default. - if ("[1.9.4]".equals(mcVersionString) || "[1.9,1.9.4]".equals(mcVersionString)) mcVersionString = "[1.9.4,1.10]"; // MC 1.8.8 and 1.8.9 is forward SRG compatible so accept these versions by default. + if ("[1.9.4]".equals(mcVersionString) || "[1.9,1.9.4]".equals(mcVersionString) || "[1.9.4,1.10)".equals(mcVersionString)) mcVersionString = "[1.9.4,1.10]"; // MC 1.8.8 and 1.8.9 is forward SRG compatible so accept these versions by default. if (!Strings.isNullOrEmpty(mcVersionString)) { minecraftAccepted = VersionParser.parseRange(mcVersionString); diff --git a/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java b/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java index 55a7ffea50..f23f68a457 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java @@ -375,7 +375,7 @@ public class VillagerRegistry } } else if (entity.func_189777_di() != null) - entity.func_189778_a(null); + entity.func_189778_a(ZombieType.NORMAL); } public static void onSetProfession(EntityZombie entity, ZombieType type, int network) {