keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Attempt to fix a possible NPE in the face of ChickenBones' hackery. ChickenBones. stop it!

This commit is contained in:
Christian 2013-01-23 23:36:59 -05:00
parent c77cb8ba53
commit f20ea649c6
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/net/minecraftforge/common/DimensionManager.java
View File

@ -240,14 +240,28 @@ public class DimensionManager
*/ */
public static void unloadWorlds(Hashtable<Integer, long[]> worldTickTimes) { public static void unloadWorlds(Hashtable<Integer, long[]> worldTickTimes) {
for (int id : unloadQueue) { for (int id : unloadQueue) {
WorldServer w = worlds.get(id);
try { try {
worlds.get(id).saveAllChunks(true, null); if (w != null)
{
w.saveAllChunks(true, null);
}
else
{
FMLLog.warning("Unexpected world unload - world %d is already unloaded", id);
}
} catch (MinecraftException e) { } catch (MinecraftException e) {
e.printStackTrace(); e.printStackTrace();
} }
MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(worlds.get(id))); finally
((WorldServer)worlds.get(id)).flush(); {
setWorld(id, null); if (w != null)
{
MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(w));
w.flush();
setWorld(id, null);
}
}
} }
unloadQueue.clear(); unloadQueue.clear();
} }