From 51f7e10834398a76132422c920b1b93e64d34cb9 Mon Sep 17 00:00:00 2001
From: StevenRS11 <stevenrs11@aol.com>
Date: Mon, 11 Nov 2013 17:33:00 -0500
Subject: [PATCH] Fixed more packet issues

---
 StevenDimDoors/mod_pocketDim/ConnectionHandler.java  | 5 ++++-
 StevenDimDoors/mod_pocketDim/core/PocketManager.java | 9 ++++++---
 StevenDimDoors/mod_pocketDim/mod_pocketDim.java      | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/StevenDimDoors/mod_pocketDim/ConnectionHandler.java b/StevenDimDoors/mod_pocketDim/ConnectionHandler.java
index 6e0a163..20ec34d 100644
--- a/StevenDimDoors/mod_pocketDim/ConnectionHandler.java
+++ b/StevenDimDoors/mod_pocketDim/ConnectionHandler.java
@@ -56,7 +56,10 @@ public class ConnectionHandler implements IConnectionHandler
 	@Override
 	public void connectionClosed(INetworkManager manager) 
 	{ 
-		return; 
+		if(PocketManager.isConnected)
+		{
+			PocketManager.unload();
+		}
 	}
 
 	@Override
diff --git a/StevenDimDoors/mod_pocketDim/core/PocketManager.java b/StevenDimDoors/mod_pocketDim/core/PocketManager.java
index 2b0358a..0cd70c0 100644
--- a/StevenDimDoors/mod_pocketDim/core/PocketManager.java
+++ b/StevenDimDoors/mod_pocketDim/core/PocketManager.java
@@ -205,6 +205,8 @@ public class PocketManager
 	private static volatile boolean isLoading = false;
 	private static volatile boolean isLoaded = false;
 	private static volatile boolean isSaving = false;
+	public static volatile boolean isConnected = false;
+
 	private static final UpdateWatcherProxy<Point4D> linkWatcher = new UpdateWatcherProxy<Point4D>();
 	private static final UpdateWatcherProxy<ClientDimData> dimWatcher = new UpdateWatcherProxy<ClientDimData>();
 	private static ArrayList<NewDimData> rootDimensions = null;
@@ -586,6 +588,7 @@ public class PocketManager
 
 	public static void unload()
 	{
+		System.out.println("Unloading Pocket Dimensions...");
 		if (!isLoaded)
 		{
 			throw new IllegalStateException("Pocket dimensions have already been unloaded!");
@@ -596,6 +599,7 @@ public class PocketManager
 		dimensionData = null;
 		rootDimensions = null;
 		isLoaded = false;
+		isConnected = false;
 	}
 	
 	public static DimLink getLink(int x, int y, int z, World world)
@@ -687,10 +691,9 @@ public class PocketManager
 		
 		// Register pocket dimensions
 		DDProperties properties = DDProperties.instance();
-		
-		registerPockets(properties);
-		
+				
 		isLoaded = true;
 		isLoading = false;
+		isConnected = true;
 	}
 }
diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
index 2afe1d5..cbc45fb 100644
--- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
+++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
@@ -93,7 +93,7 @@ serverPacketHandlerSpec =
 @SidedPacketHandler(channels = {PacketConstants.CHANNEL_NAME}, packetHandler = ServerPacketHandler.class))
 public class mod_pocketDim
 {
-	public static final String version = "1.5.2R1.4.1RC1";
+	public static final String version = "1.6.2R2.1.1RC1";
 	public static final String modid = "dimdoors";
 
 	//need to clean up