From f77d50b48c82f6472c4350a9ff41e8cb3a621655 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 17 Feb 2016 12:06:57 -0800 Subject: [PATCH] Fix loading of world ID maps for worlds without dummy data. Closes #2477 --- .../minecraftforge/fml/common/FMLContainer.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/common/FMLContainer.java b/src/main/java/net/minecraftforge/fml/common/FMLContainer.java index c1a77d183c..6808f1c2bf 100644 --- a/src/main/java/net/minecraftforge/fml/common/FMLContainer.java +++ b/src/main/java/net/minecraftforge/fml/common/FMLContainer.java @@ -305,13 +305,15 @@ public class FMLContainer extends DummyModContainer implements WorldAccessContai { entry.blocked.add(i); } - // save doesn't have dummied list - if (!regs.getCompoundTag(key).hasKey("dummied")) return; - list = regs.getCompoundTag(key).getTagList("dummied",10); - for (int x = 0; x < list.tagCount(); x++) + + if (regs.getCompoundTag(key).hasKey("dummied")) // Added in 1.8.9 dev, some worlds may not have it. { - NBTTagCompound e = list.getCompoundTagAt(x); - entry.dummied.add(new ResourceLocation(e.getString("K"))); + list = regs.getCompoundTag(key).getTagList("dummied",10); + for (int x = 0; x < list.tagCount(); x++) + { + NBTTagCompound e = list.getCompoundTagAt(x); + entry.dummied.add(new ResourceLocation(e.getString("K"))); + } } } failedElements = PersistentRegistryManager.injectSnapshot(snapshot, true, true);