diff --git a/StevenDimDoors/mod_pocketDim/BlockDimWall.java b/StevenDimDoors/mod_pocketDim/BlockDimWall.java
index 962961f..c492e00 100644
--- a/StevenDimDoors/mod_pocketDim/BlockDimWall.java
+++ b/StevenDimDoors/mod_pocketDim/BlockDimWall.java
@@ -2,10 +2,14 @@ package StevenDimDoors.mod_pocketDim;
 
 import java.util.Random;
 
+
+
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.world.World;
 
@@ -39,26 +43,42 @@ public class BlockDimWall extends Block
     {
         if(!par1World.isRemote&&entityPlayer.getCurrentEquippedItem()!=null)
         {
+        	Item playerEquip = entityPlayer.getCurrentEquippedItem().getItem();
+        	
+        	if(!(playerEquip instanceof ItemBlock))
+        	{
+        		return false;
+        	}
+        	else
+        	{
+        		Block block=  Block.blocksList[playerEquip.itemID];
+        		if(!Block.isNormalCube(playerEquip.itemID))
+        		{
+        			return false;
+        		}
+        		if(block instanceof BlockContainer)
+        		{
+        			return false;
+        		}
+        	}
+        
         
         	if(entityPlayer.getCurrentEquippedItem().getItem() instanceof ItemBlock)
         	{
+        		
+        	
         		if(!entityPlayer.capabilities.isCreativeMode)
         		{
         			entityPlayer.getCurrentEquippedItem().stackSize--;
         		}
-        		par1World.setBlockAndMetadataWithNotify(par2, par3, par4,  entityPlayer.getCurrentEquippedItem().itemID, entityPlayer.getCurrentEquippedItem().getItemDamage());
+        		par1World.setBlockAndMetadata(par2, par3, par4,  entityPlayer.getCurrentEquippedItem().itemID, entityPlayer.getCurrentEquippedItem().getItemDamage());
         		return true;
         	}
         	
         }
-        if(par1World.isRemote&&entityPlayer.getCurrentEquippedItem()!=null)
+        else
         {
-        
-        	if(entityPlayer.getCurrentEquippedItem().getItem() instanceof ItemBlock)
-        	{      		
-        		return true;
-        	}
-        	
+        	return false;
         }
 	
 	return false;
diff --git a/StevenDimDoors/mod_pocketDim/PlayerRespawnTracker.java b/StevenDimDoors/mod_pocketDim/PlayerRespawnTracker.java
index fcea6e4..a860bef 100644
--- a/StevenDimDoors/mod_pocketDim/PlayerRespawnTracker.java
+++ b/StevenDimDoors/mod_pocketDim/PlayerRespawnTracker.java
@@ -44,7 +44,7 @@ public class PlayerRespawnTracker implements IPlayerTracker
 				for(EntityItem drop :  mod_pocketDim.limboSpawnInventory)
 				{
 					
-					player.inventory.addItemStackToInventory(drop.getEntityItem());
+					player.inventory.addItemStackToInventory(drop.func_92014_d());
 				
 				
 				}
diff --git a/StevenDimDoors/mod_pocketDim/dimHelper.java b/StevenDimDoors/mod_pocketDim/dimHelper.java
index 55d8b01..a34d06f 100644
--- a/StevenDimDoors/mod_pocketDim/dimHelper.java
+++ b/StevenDimDoors/mod_pocketDim/dimHelper.java
@@ -169,18 +169,18 @@ public class dimHelper extends DimensionManager
 			cart = entity.ridingEntity;
 		}
 		 if (entity.ridingEntity != null) 
-		    {
+		 {
 		
-		    	entity.mountEntity(entity.ridingEntity);
+		   	entity.mountEntity(entity.ridingEntity);
 		    	
-		    	cart = teleportEntity(oldWorld, cart, link);
+	    	cart = teleportEntity(oldWorld, cart, link);
 		    	
-		    }
+		 }
 		    
 		    
 
 
-		World newWorld;
+		WorldServer newWorld;
 		
 		if(this.getWorld(link.destDimID)==null)
 		{
@@ -194,7 +194,7 @@ public class dimHelper extends DimensionManager
 		}
 		else
 		{
-			newWorld=oldWorld;
+			newWorld=(WorldServer)oldWorld;
 		}
 		
 	    
@@ -211,8 +211,32 @@ public class dimHelper extends DimensionManager
 	    		player.dimension = link.destDimID;
 	    		player.playerNetServerHandler.sendPacketToPlayer(new Packet9Respawn(player.dimension, (byte)player.worldObj.difficultySetting, newWorld.getWorldInfo().getTerrainType(), newWorld.getHeight(), player.theItemInWorldManager.getGameType()));
 	    	
-	    		WorldServer.class.cast(entity.worldObj).getPlayerManager().removePlayer(player);
+	    		WorldServer.class.cast(oldWorld).removeEntity(player);
+	    		player.isDead=false;
+	    		
+	    		oldWorld.playerEntities.remove(player);
+	    		WorldServer.class.cast(oldWorld).getPlayerManager().removePlayer(player);
+	    		newWorld.getPlayerManager().addPlayer(player);
+	    		player.theItemInWorldManager.setWorld(newWorld);
+	    		
+	    		player.theItemInWorldManager.setWorld((WorldServer)newWorld);
+		    	
+		    	player.mcServer.getConfigurationManager().updateTimeAndWeatherForPlayer(player, (WorldServer)newWorld);
+		    	player.mcServer.getConfigurationManager().syncPlayerInventory(player);
+		      	
+		    	for(Object potionEffect : player.getActivePotionEffects())
+		    	{
+		    		PotionEffect effect = (PotionEffect)potionEffect;
+		    		player.playerNetServerHandler.sendPacketToPlayer(new Packet41EntityEffect(player.entityId, effect));
+
+		    	}
+		    	
+		    	player.playerNetServerHandler.sendPacketToPlayer(new Packet43Experience(player.experience, player.experienceTotal, player.experienceLevel));
+		    	
+		    	
+
 	    	}
+	    	 WorldServer.class.cast(newWorld).theChunkProviderServer.loadChunk(MathHelper.floor_double(entity.posX) >> 4, MathHelper.floor_double(entity.posZ) >> 4);
 	    }
 	    
 	    
@@ -221,15 +245,7 @@ public class dimHelper extends DimensionManager
 	        int entX = entity.chunkCoordX;
 		    int entZ = entity.chunkCoordZ;
 		    
-	    	if ((entity instanceof EntityPlayer))
-		    {
-		   		EntityPlayer player = (EntityPlayer)entity;
-		   		
-		   		//player.closeScreen();
-		   		
-		   		oldWorld.playerEntities.remove(player);
-		   		//oldWorld.updateAllPlayersSleepingFlag();
-	        }
+	    	
 		
 		    if ((entity.addedToChunk) && (oldWorld.getChunkProvider().chunkExists(entX, entZ)))
 		    {
@@ -241,15 +257,7 @@ public class dimHelper extends DimensionManager
 		    oldWorld.releaseEntitySkin(entity);
 		    
 		    entity.isDead = false;
-	    }
-
-	    WorldServer.class.cast(newWorld).theChunkProviderServer.loadChunk(MathHelper.floor_double(entity.posX) >> 4, MathHelper.floor_double(entity.posZ) >> 4);
-	    
-	 
-
-
-	    if (difDest) 
-	    {
+	   
 	    	if (!(entity instanceof EntityPlayer)) 
 	    	{
 	    		NBTTagCompound entityNBT = new NBTTagCompound();
@@ -275,41 +283,6 @@ public class dimHelper extends DimensionManager
 
 	    }
 	    
-	    
-	 
-	    
-	    if ((entity instanceof EntityPlayerMP))
-	    {
-	    	EntityPlayerMP player = (EntityPlayerMP)entity;
-	    	
-	    	if (difDest)
-	    		{
-	    			player.mcServer.getConfigurationManager().func_72375_a(player, (WorldServer)newWorld);
-	    			
-
-	    		}
-	    }
-	    
-	    
-	    if (((entity instanceof EntityPlayerMP)) && (difDest)) 
-	    {
-	    	EntityPlayerMP player = (EntityPlayerMP)entity;
-	    	
-	    	player.theItemInWorldManager.setWorld((WorldServer)newWorld);
-	    	
-	    	player.mcServer.getConfigurationManager().updateTimeAndWeatherForPlayer(player, (WorldServer)newWorld);
-	    	player.mcServer.getConfigurationManager().syncPlayerInventory(player);
-	      	
-	    	for(Object potionEffect : player.getActivePotionEffects())
-	    	{
-	    		PotionEffect effect = (PotionEffect)potionEffect;
-	    		player.playerNetServerHandler.sendPacketToPlayer(new Packet41EntityEffect(player.entityId, effect));
-
-	    	}
-	    	
-	    	player.playerNetServerHandler.sendPacketToPlayer(new Packet43Experience(player.experience, player.experienceTotal, player.experienceLevel));
-	    }
-	    
 	    entity.worldObj.updateEntityWithOptionalForce(entity, false);
 
 	    new pocketTeleporter((WorldServer) newWorld, link).placeInPortal(entity, 0, 0, 0, 0);
@@ -1186,7 +1159,7 @@ public class dimHelper extends DimensionManager
 			ArrayList linksInDim=new ArrayList();
 			for(size--;size>=0;)
 			{
-				dimData = dimHelper.dimList.get(rand.nextInt(dimList.size()));
+				dimData = dimHelper.dimList.get(dimList.keySet().toArray()[rand.nextInt(dimList.keySet().size())]);
 				if(dimData==null)
 				{
 					break;