From 0d9b4071dfdef7abd519ab0dd0432b6810f2393f Mon Sep 17 00:00:00 2001 From: Robin Kupper Date: Thu, 10 Nov 2011 10:55:50 +0100 Subject: [PATCH] Added check to avoid "The permission logblock.tools.xy is already defined" errors --- src/de/diddiz/LogBlock/LogBlock.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/de/diddiz/LogBlock/LogBlock.java b/src/de/diddiz/LogBlock/LogBlock.java index 76e0845..2b458ec 100644 --- a/src/de/diddiz/LogBlock/LogBlock.java +++ b/src/de/diddiz/LogBlock/LogBlock.java @@ -196,11 +196,12 @@ public class LogBlock extends JavaPlugin timer.scheduleAtFixedRate(consumer, config.delayBetweenRuns * 1000, config.delayBetweenRuns * 1000); getLogger().info("[LogBlock] Scheduled consumer with timer."); } - for (final Tool tool : config.toolsByType.values()) { - final Permission perm = new Permission("logblock.tools." + tool.name, tool.permissionDefault); - pm.addPermission(perm); - // perm.addParent("logblock.*", true); - } + for (final Tool tool : config.toolsByType.values()) + if (pm.getPermission("logblock.tools." + tool.name) == null) { + final Permission perm = new Permission("logblock.tools." + tool.name, tool.permissionDefault); + pm.addPermission(perm); + } + // perm.addParent("logblock.*", true); getLogger().info("LogBlock v" + getDescription().getVersion() + " by DiddiZ enabled."); }