Merge remote-tracking branch 'upstream/master'

src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java

@@ -74,7 +74,10 @@ public class EventHookContainer
     		RiftRegenerator.regenerateRiftsInAllWorlds();
     	}
     	
-    	this.playMusicForDim(event.world);
+    	if(event.world!=null)
+    	{
+    		this.playMusicForDim(event.world);
+    	}
     }
     
     @ForgeSubscribe

src/main/java/StevenDimDoors/mod_pocketDim/core/NewDimData.java

@@ -372,19 +372,7 @@ public abstract class NewDimData
 	public boolean deleteLink(int x, int y, int z)
 	{
 		Point4D location = new Point4D(x, y, z, id);
-		InnerDimLink target = linkMapping.remove(location);
-		if (target != null)
-		{
-			linkList.remove(target);
-			//Raise deletion event
-			//TODO why is source null here?
-			if(target.link!=null)
-			{
-				linkWatcher.onDeleted(target.link);
-			}
-			target.clear();
-		}
-		return (target != null);
+		return this.deleteLink(this.getLink(location));
 	}
 
 	public DimLink getLink(int x, int y, int z)

src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java

@@ -73,9 +73,9 @@ public class TileEntityDimDoorGold extends TileEntityDimDoor implements IChunkLo
 
 			break;
 		}
-		for(int chunkX = -1; chunkX<2;chunkX++)
+		for(int chunkX = -2; chunkX<3;chunkX++)
 		{
-			for(int chunkZ = -1; chunkZ<2;chunkZ++)
+			for(int chunkZ = -2; chunkZ<3;chunkZ++)
 			{
 				ForgeChunkManager.forceChunk(chunkTicket, new ChunkCoordIntPair((origin.getX()+xOffset >> 4)+chunkX, (origin.getZ()+zOffset >> 4)+chunkZ));
 			}

src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java

@@ -175,7 +175,7 @@ public class TileEntityRift extends TileEntity
 	private void closeRift()
 	{
 		NewDimData dimension = PocketManager.getDimensionData(worldObj);
-		if (count2 > 20 && count2 < 22)
+		if (count2 == 20)
 		{			 
 			ArrayList<DimLink> rifts= dimension.findRiftsInRange(worldObj, 6, xCoord, yCoord, zCoord);
 			if (rifts.size()>0)