diff --git a/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java b/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java index 70d26ba6..7992dedf 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java @@ -19,14 +19,15 @@ package com.sk89q.worldguard.bukkit; import java.io.File; +import java.io.IOException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import com.sk89q.util.yaml.YAMLProcessor; import org.bukkit.World; import org.bukkit.entity.Player; -import org.bukkit.util.config.Configuration; import com.sk89q.worldguard.LocalPlayer; import com.sk89q.worldguard.blacklist.Blacklist; @@ -105,8 +106,10 @@ public void load() { plugin.createDefaultConfiguration( new File(plugin.getDataFolder(), "config.yml"), "config.yml"); - Configuration config = plugin.getConfiguration(); - config.load(); + YAMLProcessor config = new YAMLProcessor(new File(plugin.getDataFolder(), "config.yml"), true); + try { + config.load(); + } catch (IOException ignore) {} suppressTickSyncWarnings = config.getBoolean( "suppress-tick-sync-warnings", false); diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java index 5093d989..cc1a3d1a 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java @@ -31,10 +31,10 @@ import java.util.logging.Level; import java.util.logging.Logger; +import com.sk89q.util.yaml.YAMLProcessor; import org.bukkit.block.Block; import org.bukkit.entity.CreatureType; import org.bukkit.entity.Player; -import org.bukkit.util.config.Configuration; import com.sk89q.worldguard.blacklist.Blacklist; import com.sk89q.worldguard.blacklist.BlacklistLogger; @@ -69,8 +69,8 @@ public class WorldConfiguration { private WorldGuardPlugin plugin; private String worldName; - private Configuration parentConfig; - private Configuration config; + private YAMLProcessor parentConfig; + private YAMLProcessor config; private File configFile; private File blacklistFile; @@ -167,12 +167,12 @@ public WorldConfiguration(WorldGuardPlugin plugin, String worldName) { this.plugin = plugin; this.worldName = worldName; - this.parentConfig = plugin.getConfiguration(); + this.parentConfig = new YAMLProcessor(new File(plugin.getDataFolder(), "config.yml"), false); plugin.createDefaultConfiguration(configFile, "config_world.yml"); plugin.createDefaultConfiguration(blacklistFile, "blacklist.txt"); - config = new Configuration(this.configFile); + config = new YAMLProcessor(this.configFile, true); loadConfiguration(); logger.info("WorldGuard: Loaded configuration for world '" + worldName + '"'); @@ -274,7 +274,9 @@ private Object getProperty(String node) { * Load the configuration. */ private void loadConfiguration() { - config.load(); + try { + config.load(); + } catch (IOException ignore) {} opPermissions = getBoolean("op-permissions", true);