From 1adb76752f1062784dd4616d0b36fb23d288054d Mon Sep 17 00:00:00 2001
From: Robin Kupper <robbzkupper@web.de>
Date: Fri, 25 Nov 2011 19:36:24 +0100
Subject: [PATCH] Reverted getConfig() bug workaround due to Bukkit fix

---
 src/de/diddiz/LogBlock/Config.java  |  9 ++-------
 src/de/diddiz/LogBlock/Updater.java | 14 +++-----------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/de/diddiz/LogBlock/Config.java b/src/de/diddiz/LogBlock/Config.java
index c9c2a98..d7262d0 100644
--- a/src/de/diddiz/LogBlock/Config.java
+++ b/src/de/diddiz/LogBlock/Config.java
@@ -50,10 +50,7 @@ public class Config extends LoggingEnabledMapping
 	}
 
 	Config(LogBlock logblock) throws DataFormatException, IOException {
-		// TODO Reimplement when Bukkit fixed getConfig()
-		// final ConfigurationSection config = logblock.getConfig();
-		final File cfgFile = new File(logblock.getDataFolder(), "config.yml");
-		final YamlConfiguration config = YamlConfiguration.loadConfiguration(cfgFile);
+		final ConfigurationSection config = logblock.getConfig();
 		final Map<String, Object> def = new HashMap<String, Object>();
 		def.put("version", logblock.getDescription().getVersion());
 		def.put("loggedWorlds", Arrays.asList("world", "world_nether"));
@@ -108,9 +105,7 @@ public class Config extends LoggingEnabledMapping
 		for (final Entry<String, Object> e : def.entrySet())
 			if (!config.contains(e.getKey()))
 				config.set(e.getKey(), e.getValue());
-		// TODO Reimplement when Bukkit fixed getConfig()
-		// logblock.saveConfig();
-		config.save(cfgFile);
+		logblock.saveConfig();
 		url = "jdbc:mysql://" + config.getString("mysql.host") + ":" + config.getInt("mysql.port") + "/" + config.getString("mysql.database");
 		user = config.getString("mysql.user");
 		password = config.getString("mysql.password");
diff --git a/src/de/diddiz/LogBlock/Updater.java b/src/de/diddiz/LogBlock/Updater.java
index cbb38c9..e8cd1aa 100644
--- a/src/de/diddiz/LogBlock/Updater.java
+++ b/src/de/diddiz/LogBlock/Updater.java
@@ -13,6 +13,7 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.logging.Level;
 import org.bukkit.Bukkit;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 class Updater
@@ -24,10 +25,7 @@ class Updater
 	}
 
 	boolean update() {
-		// TODO Reimplement when Bukkit fixed getConfig()
-		// final ConfigurationSection config = logblock.getConfig();
-		final File cfgFile = new File(logblock.getDataFolder(), "config.yml");
-		final YamlConfiguration config = YamlConfiguration.loadConfiguration(cfgFile);
+		final ConfigurationSection config = logblock.getConfig();
 		if (config.getString("version").compareTo(logblock.getDescription().getVersion()) >= 0)
 			return false;
 		if (config.getString("version").compareTo("1.27") < 0) {
@@ -140,13 +138,7 @@ class Updater
 			config.set("clearlog.keepLogDays", null);
 			config.set("version", "1.42");
 		}
-		// TODO Reimplement when Bukkit fixed getConfig()
-		// logblock.saveConfig();
-		try {
-			config.save(cfgFile);
-		} catch (final IOException ex) {
-			Bukkit.getLogger().log(Level.SEVERE, "[LogBlock Updater] Error: ", ex);
-		}
+		logblock.saveConfig();
 		return true;
 	}