Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 16:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Do not attempt to load an empty treasure config

Browse Source
This commit is contained in:
NuclearW 2013-03-03 19:32:00 -05:00
parent 1b461ac96a
commit e3e4cf9884
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java
View File

@ -52,6 +52,11 @@ public class TreasureConfig extends ConfigLoader {
protected void loadKeys() { protected void loadKeys() {
Map<String, Treasure> treasures = new HashMap<String, Treasure>(); Map<String, Treasure> treasures = new HashMap<String, Treasure>();
ConfigurationSection treasureSection = config.getConfigurationSection("Treasures"); ConfigurationSection treasureSection = config.getConfigurationSection("Treasures");
if (treasureSection == null) {
return;
}
Set<String> treasureConfigSet = treasureSection.getKeys(false); Set<String> treasureConfigSet = treasureSection.getKeys(false);
for (String treasureName : treasureConfigSet) { for (String treasureName : treasureConfigSet) {
@ -211,14 +216,14 @@ public class TreasureConfig extends ConfigLoader {
Treasure treasure = nextEntry.getValue(); Treasure treasure = nextEntry.getValue();
if (treasure instanceof FishingTreasure) { if (treasure instanceof FishingTreasure) {
if (!fishingTreasures.contains(treasureKey)) { if (fishingTreasures == null || !fishingTreasures.contains(treasureKey)) {
continue; continue;
} }
fishingRewards.add((FishingTreasure) treasure); fishingRewards.add((FishingTreasure) treasure);
} }
else if (treasure instanceof HylianTreasure) { else if (treasure instanceof HylianTreasure) {
if (!hylianTreasures.contains(treasureKey)) { if (hylianTreasures == null || !hylianTreasures.contains(treasureKey)) {
continue; continue;
} }
@ -237,7 +242,7 @@ public class TreasureConfig extends ConfigLoader {
} }
} }
else if (treasure instanceof ExcavationTreasure) { else if (treasure instanceof ExcavationTreasure) {
if (!excavationTreasures.contains(treasureKey)) { if (excavationTreasures == null || !excavationTreasures.contains(treasureKey)) {
continue; continue;
} }