From 004d06ab7d89300271f3d93c48721a54d7811499 Mon Sep 17 00:00:00 2001
From: StevenRS11 <stevenrs11@aol.com>
Date: Sun, 2 Jun 2013 09:57:05 -0400
Subject: [PATCH] more work on import

---
 .../mod_pocketDim/SchematicLoader.java        | 24 +++++++++++++------
 StevenDimDoors/mod_pocketDim/dimHelper.java   |  2 +-
 .../mod_pocketDim/mod_pocketDim.java          |  2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/StevenDimDoors/mod_pocketDim/SchematicLoader.java b/StevenDimDoors/mod_pocketDim/SchematicLoader.java
index bfa51c9..494241d 100644
--- a/StevenDimDoors/mod_pocketDim/SchematicLoader.java
+++ b/StevenDimDoors/mod_pocketDim/SchematicLoader.java
@@ -98,7 +98,10 @@ public class SchematicLoader
              
              blocks=new short[blockId.length];
              
-              this.addId = nbtdata.getByteArray("AddBlocks");
+             if(nbtdata.getByteArray("AddBlocks")!=null)
+             {
+            	 this.addId = nbtdata.getByteArray("AddBlocks");
+             }
              
               entities = nbtdata.getTagList("Entities");
               tileentities = nbtdata.getTagList("TileEntities");
@@ -106,13 +109,20 @@ public class SchematicLoader
               input.close();
               
               
-              for (int index = 0; index < blockId.length; index++) {
-                  if ((index >> 1) >= addId.length) { // No corresponding AddBlocks index
+              for (int index = 0; index < blockId.length; index++) 
+              {
+                  if ((index >> 1) >= addId.length) 
+                  { 
                       blocks[index] = (short) (blockId[index] & 0xFF);
-                  } else {
-                      if ((index & 1) == 0) {
+                  }
+                  else 
+                  {
+                      if ((index & 1) == 0) 
+                      {
                           blocks[index] = (short) (((addId[index >> 1] & 0x0F) << 8) + (blockId[index] & 0xFF));
-                      } else {
+                          
+                      } else 
+                      {
                           blocks[index] = (short) (((addId[index >> 1] & 0xF0) << 4) + (blockId[index] & 0xFF));
                       }
                   }
@@ -759,7 +769,7 @@ public class SchematicLoader
 		                    
 		                    if(Block.blocksList[blockToReplace]==null&&blockToReplace!=0||blockToReplace>158)
 		                    		{
-		                    			blockToReplace=mod_pocketDim.blockDimWall.blockID;
+		                    		//	blockToReplace=mod_pocketDim.blockDimWall.blockID;
 		                    		}
 		                 
 		                    if(blockToReplace>0)
diff --git a/StevenDimDoors/mod_pocketDim/dimHelper.java b/StevenDimDoors/mod_pocketDim/dimHelper.java
index c89b592..6b80791 100644
--- a/StevenDimDoors/mod_pocketDim/dimHelper.java
+++ b/StevenDimDoors/mod_pocketDim/dimHelper.java
@@ -343,7 +343,7 @@ public class dimHelper extends DimensionManager
 				}
 			
 					
-				if(entity instanceof EntityPlayerMP)
+				if(!world.isRemote)
 				{
 					
 					entity = this.teleportEntity(world, entity, linkData);		
diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
index 364ba48..b62f7e7 100644
--- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
+++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
@@ -438,7 +438,7 @@ public class mod_pocketDim
         
         
         DimensionManager.registerProviderType(this.providerID, pocketProvider.class, false);
-        DimensionManager.registerProviderType(this.limboProviderID, LimboProvider.class, true);
+        DimensionManager.registerProviderType(this.limboProviderID, LimboProvider.class, false);