Major Improvements to DungeonHelper, Minor Bug Fixes and Tweaks #25

Merged
SenseiKiwi merged 29 commits from master into master 2013-06-16 19:30:26 +00:00
Showing only changes of commit cf2246061c - Show all commits

View File

@@ -507,15 +507,16 @@ public class DungeonHelper
int depthWeight = rand.nextInt(depth)+rand.nextInt(depth)-2; int depthWeight = rand.nextInt(depth)+rand.nextInt(depth)-2;
depth=depth-2; depth = depth - 2;
// DungeonGenerator
boolean flag = true; boolean flag = true;
int count=10; int count = 10;
try try
{ {
if(dimHelper.dimList.get(incoming.destDimID)!=null&&dimHelper.dimList.get(incoming.destDimID).dungeonGenerator!=null) if (dimHelper.dimList.get(incoming.destDimID) != null&&dimHelper.dimList.get(incoming.destDimID).dungeonGenerator!=null)
{ {
mod_pocketDim.loader.init(incoming); mod_pocketDim.loader.init(incoming);
//TODO: Check this!
//What the hell? Isn't this line saying X = X..? ~SenseiKiwi
dimHelper.dimList.get(incoming.destDimID).dungeonGenerator=dimHelper.dimList.get(incoming.destDimID).dungeonGenerator; dimHelper.dimList.get(incoming.destDimID).dungeonGenerator=dimHelper.dimList.get(incoming.destDimID).dungeonGenerator;
return; return;
} }
@@ -644,13 +645,13 @@ public class DungeonHelper
} }
catch (Exception e) catch (Exception e)
{ {
e.printStackTrace();
if (weightedDungeonGenList.size() > 0) if (weightedDungeonGenList.size() > 0)
{ {
dungeon = weightedDungeonGenList.get(rand.nextInt(weightedDungeonGenList.size())); dungeon = weightedDungeonGenList.get(rand.nextInt(weightedDungeonGenList.size()));
} }
else else
{ {
e.printStackTrace();
return; return;
} }
} }