From 5d88d04fa38b353ef8ded055a98948c7c7df08e8 Mon Sep 17 00:00:00 2001 From: Robin Kupper Date: Tue, 18 Oct 2011 21:21:14 +0200 Subject: [PATCH] CB #1317 compat --- src/de/diddiz/LogBlock/Config.java | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/de/diddiz/LogBlock/Config.java b/src/de/diddiz/LogBlock/Config.java index 09ec47f..1b2e6ed 100644 --- a/src/de/diddiz/LogBlock/Config.java +++ b/src/de/diddiz/LogBlock/Config.java @@ -150,19 +150,20 @@ public class Config installSpout = config.getBoolean("updater.installSpout", true); checkVersion = config.getBoolean("updater.checkVersion", true); final List tools = new ArrayList(); - for (final String toolName : config.getConfigurationSection("tools").getKeys(false)) + final ConfigurationSection toolsSec = config.getConfigurationSection("tools"); + for (final String toolName : toolsSec.getKeys(false)) try { - final String path = "tools." + toolName; - final List aliases = toStringList(config.getList(path + ".aliases")); - final ToolBehavior leftClickBehavior = ToolBehavior.valueOf(config.getString(path + ".leftClickBehavior").toUpperCase()); - final ToolBehavior rightClickBehavior = ToolBehavior.valueOf(config.getString(path + ".rightClickBehavior").toUpperCase()); - final boolean defaultEnabled = config.getBoolean(path + ".defaultEnabled", false); - final int item = config.getInt(path + ".item", 0); + final ConfigurationSection tSec = toolsSec.getConfigurationSection(toolName); + final List aliases = toStringList(tSec.getList("aliases")); + final ToolBehavior leftClickBehavior = ToolBehavior.valueOf(tSec.getString("leftClickBehavior").toUpperCase()); + final ToolBehavior rightClickBehavior = ToolBehavior.valueOf(tSec.getString("rightClickBehavior").toUpperCase()); + final boolean defaultEnabled = tSec.getBoolean("defaultEnabled", false); + final int item = tSec.getInt("item", 0); final QueryParams params = new QueryParams(logblock); params.prepareToolQuery = true; - params.parseArgs(Bukkit.getConsoleSender(), Arrays.asList(config.getString(path + ".params").split(" "))); - final ToolMode mode = ToolMode.valueOf(config.getString(path + ".mode").toUpperCase()); - final PermissionDefault pdef = PermissionDefault.valueOf(config.getString(path + ".permissionDefault").toUpperCase()); + params.parseArgs(Bukkit.getConsoleSender(), Arrays.asList(tSec.getString("params").split(" "))); + final ToolMode mode = ToolMode.valueOf(tSec.getString("mode").toUpperCase()); + final PermissionDefault pdef = PermissionDefault.valueOf(tSec.getString("permissionDefault").toUpperCase()); tools.add(new Tool(toolName, aliases, leftClickBehavior, rightClickBehavior, defaultEnabled, item, params, mode, pdef)); } catch (final Exception ex) { getLogger().log(Level.WARNING, "Error at parsing tool '" + toolName + "': ", ex);