From b4116f1f316875697146388a0459a49cb47486bf Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 28 Mar 2013 08:19:24 -0400 Subject: [PATCH] Fix possible NPE in ChunkManager. Closes #478 in reality --- common/net/minecraftforge/common/ForgeChunkManager.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/net/minecraftforge/common/ForgeChunkManager.java b/common/net/minecraftforge/common/ForgeChunkManager.java index b12ba052d2..d5741d8a3a 100644 --- a/common/net/minecraftforge/common/ForgeChunkManager.java +++ b/common/net/minecraftforge/common/ForgeChunkManager.java @@ -498,6 +498,10 @@ public class ForgeChunkManager for (String modId : loadedTickets.keySet()) { LoadingCallback loadingCallback = callbacks.get(modId); + if (loadingCallback == null) + { + continue; + } int maxTicketLength = getMaxTicketLengthFor(modId); List tickets = loadedTickets.get(modId); if (loadingCallback instanceof OrderedLoadingCallback) @@ -516,6 +520,10 @@ public class ForgeChunkManager for (String modId : playerLoadedTickets.keySet()) { LoadingCallback loadingCallback = callbacks.get(modId); + if (loadingCallback == null) + { + continue; + } ListMultimap tickets = playerLoadedTickets.get(modId); if (loadingCallback instanceof PlayerOrderedLoadingCallback) {