apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

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
parent 6393c240d6 77965d7d0d
commit cac45814a9
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
StevenDimDoors/mod_pocketDim/SchematicLoader.java
View File

@@ -76,11 +76,15 @@ 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)
{ {
filePath = dimHelper.dimList.get(link.destDimID).dungeonGenerator.schematicPath;
DungeonHelper.instance().generateDungeonLink(link);
} }
filePath = dimHelper.dimList.get(link.destDimID).dungeonGenerator.schematicPath;
} }
@@ -88,6 +92,7 @@ public class SchematicLoader
this.schematic=filePath; this.schematic=filePath;
try try
{ {

6
StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java
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)
{ {