diff --git a/src/de/diddiz/LogBlock/Config.java b/src/de/diddiz/LogBlock/Config.java index 598cfe0..17aa84c 100644 --- a/src/de/diddiz/LogBlock/Config.java +++ b/src/de/diddiz/LogBlock/Config.java @@ -50,7 +50,10 @@ public class Config extends LoggingEnabledMapping } Config(LogBlock logblock) throws DataFormatException, IOException { - final ConfigurationSection config = logblock.getConfig(); + // 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 Map def = new HashMap(); def.put("version", logblock.getDescription().getVersion()); def.put("loggedWorlds", Arrays.asList("world", "world_nether")); @@ -106,7 +109,9 @@ public class Config extends LoggingEnabledMapping for (final Entry e : def.entrySet()) if (!config.contains(e.getKey())) config.set(e.getKey(), e.getValue()); - logblock.saveConfig(); + // TODO Reimplement when Bukkit fixed getConfig() + // logblock.saveConfig(); + config.save(cfgFile); 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 e8cd1aa..cbb38c9 100644 --- a/src/de/diddiz/LogBlock/Updater.java +++ b/src/de/diddiz/LogBlock/Updater.java @@ -13,7 +13,6 @@ 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 @@ -25,7 +24,10 @@ class Updater } boolean update() { - final ConfigurationSection config = logblock.getConfig(); + // 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); if (config.getString("version").compareTo(logblock.getDescription().getVersion()) >= 0) return false; if (config.getString("version").compareTo("1.27") < 0) { @@ -138,7 +140,13 @@ class Updater config.set("clearlog.keepLogDays", null); config.set("version", "1.42"); } - logblock.saveConfig(); + // 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); + } return true; }