From a78501369097f43dd89b49a4de59cf28d51ec0e3 Mon Sep 17 00:00:00 2001
From: KHobbits <rob@khobbits.co.uk>
Date: Sat, 3 Dec 2011 23:38:28 +0000
Subject: Show command conflict in debug mode.

---
 .../earth2me/essentials/AlternativeCommandsHandler.java   | 15 +++++++++++----
 Essentials/src/com/earth2me/essentials/Essentials.java    |  3 +--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
index 366c86cc6..e75644ad5 100644
--- a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
+++ b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
@@ -1,6 +1,8 @@
 package com.earth2me.essentials;
 
 import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.bukkit.command.Command;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.command.PluginCommandYamlParser;
@@ -9,8 +11,9 @@ import org.bukkit.plugin.Plugin;
 
 public class AlternativeCommandsHandler
 {
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private final transient Map<String, List<PluginCommand>> altcommands = new HashMap<String, List<PluginCommand>>();
-	private final transient Map<String, String> executed = new HashMap<String, String>();
+	private final transient Map<String, String> disabledList = new HashMap<String, String>();
 	private final transient IEssentials ess;
 
 	public AlternativeCommandsHandler(final IEssentials ess)
@@ -118,13 +121,17 @@ public class AlternativeCommandsHandler
 		return commands.get(0);
 	}
 
-	public void executed(final String label, final String otherlabel)
+	public void executed(final String label, final String otherLabel)
 	{
-		executed.put(label, otherlabel);
+		if (ess.getSettings().isDebug())
+		{
+			LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + otherLabel);
+		}
+		disabledList.put(label, otherLabel);
 	}
 
 	public Map<String, String> disabledCommands()
 	{
-		return executed;
+		return disabledList;
 	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index ca86b2b2a..98d919150 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -309,8 +309,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 			final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel);
 			if (pc != null)
 			{
-				alternativeCommandsHandler.executed(commandLabel, pc.getLabel());
-				LOGGER.log(Level.FINE, "Essentials: Alternative command " + commandLabel + " found, using " + pc.getLabel());
+				alternativeCommandsHandler.executed(commandLabel, pc.getLabel());				
 				return pc.execute(sender, commandLabel, args);
 			}
 		}
-- 
cgit v1.2.3