Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
tastybento committed May 5, 2017
1 parent 2b13ddf commit 6cf2010
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 6 deletions.
13 changes: 11 additions & 2 deletions src/com/wasteofplastic/askyblock/Island.java
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,12 @@ public void setIgsDefaults() {
// Default default
this.igs.put(flag, false);
} else {
this.igs.put(flag, Settings.defaultIslandSettings.get(flag));
if (Settings.defaultIslandSettings.get(flag) == null) {
//plugin.getLogger().info("DEBUG: null flag " + flag);
this.igs.put(flag, false);
} else {
this.igs.put(flag, Settings.defaultIslandSettings.get(flag));
}
}
}
}
Expand All @@ -414,7 +419,11 @@ public void setSpawnDefaults() {
// Default default
this.igs.put(flag, false);
} else {
this.igs.put(flag, Settings.defaultSpawnSettings.get(flag));
if (Settings.defaultSpawnSettings.get(flag) == null) {
this.igs.put(flag, false);
} else {
this.igs.put(flag, Settings.defaultSpawnSettings.get(flag));
}
}
}
}
Expand Down
14 changes: 10 additions & 4 deletions src/com/wasteofplastic/askyblock/PluginConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -781,9 +781,10 @@ public static boolean loadPluginConfig(ASkyBlock plugin) {
for (String setting: protectionWorld.getKeys(false)) {
try {
SettingsFlag flag = SettingsFlag.valueOf(setting.toUpperCase());
Settings.defaultWorldSettings.put(flag, plugin.getConfig().getBoolean("protection.world." + flag.name()));
Settings.defaultSpawnSettings.put(flag, Settings.defaultWorldSettings.get(flag));
Settings.defaultIslandSettings.put(flag, Settings.defaultWorldSettings.get(flag));
boolean value = plugin.getConfig().getBoolean("protection.world." + flag.name());
Settings.defaultWorldSettings.put(flag, value);
Settings.defaultSpawnSettings.put(flag, value);
Settings.defaultIslandSettings.put(flag, value);
} catch (Exception e) {
plugin.getLogger().severe("Unknown setting in config.yml:protection.world " + setting.toUpperCase() + " skipping...");
}
Expand All @@ -794,6 +795,12 @@ public static boolean loadPluginConfig(ASkyBlock plugin) {
plugin.getLogger().warning("config.yml:protection.world."+flag.name() + " is missing. You should add it to the config file. Setting to false by default");
Settings.defaultWorldSettings.put(flag, false);
}
if (!Settings.defaultIslandSettings.containsKey(flag)) {
Settings.defaultIslandSettings.put(flag, false);
}
if (!Settings.defaultSpawnSettings.containsKey(flag)) {
Settings.defaultSpawnSettings.put(flag, false);
}
}
ConfigurationSection protectionIsland = plugin.getConfig().getConfigurationSection("protection.island");
for (String setting: protectionIsland.getKeys(false)) {
Expand All @@ -807,7 +814,6 @@ public static boolean loadPluginConfig(ASkyBlock plugin) {
plugin.getLogger().severe("Unknown setting in config.yml:island.world " + setting.toUpperCase() + " skipping...");
}
}

// ******************** Biome Settings *********************
Settings.biomeCost = plugin.getConfig().getDouble("biomesettings.defaultcost", 100D);
if (Settings.biomeCost < 0D) {
Expand Down

0 comments on commit 6cf2010

Please sign in to comment.