Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-01-26 01:51:19 +01:00
Code Issues Projects Releases Wiki Activity

Corrected formatting of configuration files

Browse Source 
Fixes #1025
This commit is contained in:
zml2008 2012-01-24 15:15:50 -08:00 committed by TomyLobo
parent d33be37694
commit 1224d3b443
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java
View File

@ -25,6 +25,7 @@
import java.util.Map;
import java.util.Set;
import com.sk89q.util.yaml.YAMLFormat;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.World;
import org.bukkit.entity.Player;
@ -101,7 +102,7 @@ public void load() {
plugin.createDefaultConfiguration(
new File(plugin.getDataFolder(), "config.yml"), "config.yml");
YAMLProcessor config = new YAMLProcessor(new File(plugin.getDataFolder(), "config.yml"), true);
YAMLProcessor config = new YAMLProcessor(new File(plugin.getDataFolder(), "config.yml"), true, YAMLFormat.EXTENDED);
try {
config.load();
} catch (IOException ignore) {}
@ -114,6 +115,8 @@ public void load() {
"auto-invincible", config.getBoolean("auto-invincible-permission", true));
usePlayerMove = config.getBoolean(
"use-player-move-event", true);
config.setWriteDefaults(false);
// Load configurations for each world
for (World world : plugin.getServer().getWorlds()) {

5
src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java
View File

@ -31,6 +31,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import com.sk89q.util.yaml.YAMLFormat;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.block.Block;
import org.bukkit.entity.CreatureType;
@ -167,12 +168,12 @@ public WorldConfiguration(WorldGuardPlugin plugin, String worldName) {
this.plugin = plugin;
this.worldName = worldName;
this.parentConfig = new YAMLProcessor(new File(plugin.getDataFolder(), "config.yml"), false);
this.parentConfig = new YAMLProcessor(new File(plugin.getDataFolder(), "config.yml"), false, YAMLFormat.EXTENDED);
plugin.createDefaultConfiguration(configFile, "config_world.yml");
plugin.createDefaultConfiguration(blacklistFile, "blacklist.txt");
config = new YAMLProcessor(this.configFile, true);
config = new YAMLProcessor(this.configFile, true, YAMLFormat.EXTENDED);
loadConfiguration();
logger.info("WorldGuard: Loaded configuration for world '" + worldName + '"');