Merge remote-tracking branch 'upstream/master'

StevenDimDoors/mod_pocketDim/TileEntityRift.java

@@ -106,6 +106,11 @@ public class TileEntityRift extends TileEntity
 			 }
 			 count=0;
 		 }
+		else if(dimHelper.instance.getLinkDataFromCoords(xCoord, yCoord, zCoord, this.worldObj.provider.dimensionId)==null)
+		{
+			this.invalidate();
+			this.worldObj.setBlockToAir(xCoord, yCoord, zCoord);
+		}
 		 count++;
 		 
 		 if(this.shouldClose)

StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java

@@ -137,7 +137,7 @@ public class MobObelisk extends EntityFlying implements IMob
 		{
 			if(this.soundTime<=0)
 			{
-				this.playSound("mods.DimDoors.sfx.monk",  1.7F, 1F);
+				this.playSound("mods.DimDoors.sfx.monk",  1.5F, 1F);
 				this.soundTime=100;
 			}
 

StevenDimDoors/mod_pocketDim/world/LimboGenerator.java

@@ -180,7 +180,7 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi
 	
 		
 			
-			if(true)
+			if(rand.nextInt(4)>1)
 			{
 				return;
 			}

StevenDimDoors/mod_pocketDim/world/pocketGenerator.java

@@ -69,7 +69,7 @@ public class pocketGenerator extends ChunkProviderGenerate implements IChunkProv
 		{
 			if(!dimHelper.dimList.get(worldObj.provider.dimensionId).isDimRandomRift)
 			{
-			//	return;
+				return;
 			}
 		}
 		int y =0;