Fix failing to load a world with missing mod blocks and items. There will be a way to force worlds to load

when stuff is missing, but for right now, it will fail as this is "world safe".
This commit is contained in:
Christian committed 2014-02-08 22:37:40 -05:00
1 parent c890206268
commit 995c204338
6 files changed
+142 -20

No files matched your search

@@ -266,6 +266,7 @@ public class FMLCommonHandler
public boolean handleServerStarting(MinecraftServer server)
{
sidedDelegate.serverLoadedSuccessfully();
return Loader.instance().serverStarting(server);
}
@@ -380,7 +381,15 @@ public class FMLCommonHandler
WorldAccessContainer wac = ((InjectedModContainer)mc).getWrappedWorldAccessContainer();
if (wac != null)
{
wac.readData(handler, worldInfo, additionalProperties, tagCompound.func_74775_l(mc.getModId()));
try
{
wac.readData(handler, worldInfo, additionalProperties, tagCompound.func_74775_l(mc.getModId()));
}
catch (RuntimeException ex)
{
sidedDelegate.failedServerLoading(ex, wac);
throw ex;
}
}
}
}