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

2013-06-16 01:30:50 -04:00
parent 8e200da01b cb9c996861
commit af555bbac8
3 changed files with 18 additions and 4 deletions
--- a/StevenDimDoors/mod_pocketDim/SchematicLoader.java
+++ b/StevenDimDoors/mod_pocketDim/SchematicLoader.java
@@ -72,7 +72,21 @@ public class SchematicLoader

 	public void init(LinkData link)
 	{
-		String filePath = dimHelper.dimList.get(link.destDimID).dungeonGenerator.schematicPath;
+		//adding default pocket
+		String filePath="";
+		if(!dimHelper.dimList.containsKey(link.destDimID))
+		{
+			
+		}
+		else if(dimHelper.dimList.get(link.destDimID).dungeonGenerator==null)
+		{
+			
+		}
+		else
+		{
+			filePath = dimHelper.dimList.get(link.destDimID).dungeonGenerator.schematicPath;
+		}
+		

 		this.schematic=filePath;
 		try