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

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
Conversation 3 Commits 29 Files Changed 11 +3 -2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9828bd7f40 - Show all commits

1
StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java
View File

@@ -63,7 +63,6 @@ public class CommandEndDungeonCreation extends CommandBase
{ {
DungeonGenerator newDungeon = mod_pocketDim.dungeonHelper.exportDungeon(player.worldObj, x, y, z, properties.CustomSchematicDirectory + "/" + var2[0] + ".schematic"); DungeonGenerator newDungeon = mod_pocketDim.dungeonHelper.exportDungeon(player.worldObj, x, y, z, properties.CustomSchematicDirectory + "/" + var2[0] + ".schematic");
player.sendChatToPlayer("created dungeon schematic in " + properties.CustomSchematicDirectory + "/" + var2[0]+".schematic"); player.sendChatToPlayer("created dungeon schematic in " + properties.CustomSchematicDirectory + "/" + var2[0]+".schematic");
mod_pocketDim.dungeonHelper.customDungeons.add(newDungeon);
if (mod_pocketDim.dungeonHelper.customDungeonStatus.containsKey(player.worldObj.provider.dimensionId) && !player.worldObj.isRemote) if (mod_pocketDim.dungeonHelper.customDungeonStatus.containsKey(player.worldObj.provider.dimensionId) && !player.worldObj.isRemote)
{ {

4
StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java
View File

@@ -31,6 +31,7 @@ public class DungeonHelper
private static final String SCHEMATIC_FILE_EXTENSION = ".schematic"; private static final String SCHEMATIC_FILE_EXTENSION = ".schematic";
private static final int DEFAULT_DUNGEON_WEIGHT = 100; private static final int DEFAULT_DUNGEON_WEIGHT = 100;
private static final int MAX_DUNGEON_WEIGHT = 10000; //Used to prevent overflows and math breaking down
private static final String HUB_DUNGEON_TYPE = "Hub"; private static final String HUB_DUNGEON_TYPE = "Hub";
private static final String TRAP_DUNGEON_TYPE = "Trap"; private static final String TRAP_DUNGEON_TYPE = "Trap";
@@ -125,7 +126,7 @@ public class DungeonHelper
try try
{ {
int weight = Integer.parseInt(dungeonData[3]); int weight = Integer.parseInt(dungeonData[3]);
if (weight < 0) if (weight < 0 || weight > MAX_DUNGEON_WEIGHT)
return false; return false;
} }
catch (NumberFormatException e) catch (NumberFormatException e)
@@ -158,6 +159,7 @@ public class DungeonHelper
dungeonTypeMapping.get(dungeonType).add(generator); dungeonTypeMapping.get(dungeonType).add(generator);
weightedDungeonGenList.add(generator); weightedDungeonGenList.add(generator);
registeredDungeons.add(generator); registeredDungeons.add(generator);
customDungeons.add(generator);
System.out.println("Imported " + name); System.out.println("Imported " + name);
} }
else else