Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
SenseiKiwi 2013-06-18 22:43:15 -04:00
commit cac45814a9
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
StevenDimDoors/mod_pocketDim/SchematicLoader.java
View file

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

6
StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java
View file

@ -523,12 +523,6 @@ public class DungeonHelper
boolean flag = true;
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)
{