From 8bfe9dc22ecd56b785e5c2c830dac55271a50f40 Mon Sep 17 00:00:00 2001
From: SenseiKiwi <senseikiwi@server.fake>
Date: Tue, 3 Sep 2013 18:28:42 -0400
Subject: [PATCH] Fixed More Bugs

Fixed more bugs. Now it's possible to generate a world without crashing.
Unfortunately, it's clear that there is a packet-sending loop going on.
I'll have to add a check to prevent integrated servers from spamming
themselves.
---
 .../mod_pocketDim/EventHookContainer.java           | 13 ++++++++++++-
 StevenDimDoors/mod_pocketDim/core/NewDimData.java   |  2 +-
 StevenDimDoors/mod_pocketDim/mod_pocketDim.java     |  1 -
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/StevenDimDoors/mod_pocketDim/EventHookContainer.java
index 025a24f..2e2756d 100644
--- a/StevenDimDoors/mod_pocketDim/EventHookContainer.java
+++ b/StevenDimDoors/mod_pocketDim/EventHookContainer.java
@@ -36,7 +36,18 @@ public class EventHookContainer
     @ForgeSubscribe
     public void onWorldLoad(WorldEvent.Load event)
     {
-    	RiftRegenerator.regenerateRiftsInAllWorlds();
+    	// We need to initialize PocketManager here because onServerAboutToStart fires before we can
+    	// use DimensionManager and onServerStarting fires after the game tries to generate terrain.
+    	// If a gateway tries to generate before PocketManager has initialized, we get a crash.
+    	if (!PocketManager.isLoaded())
+    	{
+    		PocketManager.load();
+    	}
+    	
+    	if (PocketManager.isLoaded())
+    	{
+    		RiftRegenerator.regenerateRiftsInAllWorlds();
+    	}
     }
     
     @ForgeSubscribe
diff --git a/StevenDimDoors/mod_pocketDim/core/NewDimData.java b/StevenDimDoors/mod_pocketDim/core/NewDimData.java
index 0be6468..40fe18d 100644
--- a/StevenDimDoors/mod_pocketDim/core/NewDimData.java
+++ b/StevenDimDoors/mod_pocketDim/core/NewDimData.java
@@ -127,7 +127,7 @@ public abstract class NewDimData
 		IUpdateWatcher<Point4D> linkWatcher)
 	{
 		// The isPocket flag is redundant. It's meant as an integrity safeguard.
-		if (isPocket == (parent != null))
+		if (isPocket != (parent != null))
 		{
 			throw new NullPointerException("Dimensions can be pocket dimensions if and only if they have a parent dimension.");
 		}
diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
index c7cd467..4ab5058 100644
--- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
+++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
@@ -384,6 +384,5 @@ public class mod_pocketDim
 		CommandCreatePocket.instance().register(event);
 		CommandTeleportPlayer.instance().register(event);
 		*/
-		PocketManager.load();
 	}
 }