Merge remote-tracking branch 'upstream/master' into R1.4.0-improvements

2013-06-25 13:55:34 -04:00
parent bc2745a596 60972eab21
commit e0ccb59d15
4 changed files with 15 additions and 4 deletions
--- a/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java
+++ b/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java
@@ -906,6 +906,10 @@ public class dimHelper extends DimensionManager
 	public LinkData createPocket(LinkData link , boolean isGoingDown, boolean isRandomRift)
 	{
 		DDProperties properties = DDProperties.instance();
+		if(dimHelper.getWorld(0)==null)
+		{
+			return link;
+		}
 		
 		if (dimHelper.getWorld(link.locDimID) == null)
 		{