New Rift Blade Setting and Minor Bug Fix #29

Merged
SenseiKiwi merged 3 commits from master into master 2013-06-19 05:14:15 +00:00
2 changed files with 8 additions and 9 deletions
Showing only changes of commit cac45814a9 - Show all commits

View File

@@ -76,12 +76,17 @@ public class SchematicLoader
String filePath=DungeonHelper.instance().defaultBreak.schematicPath; String filePath=DungeonHelper.instance().defaultBreak.schematicPath;
if(dimHelper.dimList.containsKey(link.destDimID)) if(dimHelper.dimList.containsKey(link.destDimID))
{ {
if(dimHelper.dimList.get(link.destDimID).dungeonGenerator!=null) if(dimHelper.dimList.get(link.destDimID).dungeonGenerator==null)
{ {
DungeonHelper.instance().generateDungeonLink(link);
}
filePath = dimHelper.dimList.get(link.destDimID).dungeonGenerator.schematicPath; filePath = dimHelper.dimList.get(link.destDimID).dungeonGenerator.schematicPath;
} }
}

View File

@@ -523,12 +523,6 @@ public class DungeonHelper
boolean flag = true; boolean flag = true;
try try
{ {
if (dimHelper.dimList.get(incoming.destDimID) != null &&
dimHelper.dimList.get(incoming.destDimID).dungeonGenerator != null)
{
mod_pocketDim.loader.init(incoming);
return;
}
if (incoming.destYCoord > 15) if (incoming.destYCoord > 15)
{ {