summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-12-21 06:38:51 +0000
committerKHobbits <rob@khobbits.co.uk>2012-12-21 06:38:51 +0000
commit617959a11b23e0fe38d82be34247d71e9fcb525a (patch)
tree0ac16bcc0c42d6c02d5d5133bcfdbf1f6671d023
parenta480091617e9e472dc114865e77be786e3b04015 (diff)
downloadEssentials-617959a11b23e0fe38d82be34247d71e9fcb525a.tar
Essentials-617959a11b23e0fe38d82be34247d71e9fcb525a.tar.gz
Essentials-617959a11b23e0fe38d82be34247d71e9fcb525a.tar.lz
Essentials-617959a11b23e0fe38d82be34247d71e9fcb525a.tar.xz
Essentials-617959a11b23e0fe38d82be34247d71e9fcb525a.zip
Log target plugin in debug mode for altcmd
-rw-r--r--Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java7
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java2
2 files changed, 5 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
index e75644ad5..e9cb6fe19 100644
--- a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
+++ b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
@@ -121,13 +121,14 @@ public class AlternativeCommandsHandler
return commands.get(0);
}
- public void executed(final String label, final String otherLabel)
+ public void executed(final String label, final PluginCommand pc)
{
+ final String altString = pc.getPlugin().getName() + ":" + pc.getLabel();
if (ess.getSettings().isDebug())
{
- LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + otherLabel);
+ LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + altString);
}
- disabledList.put(label, otherLabel);
+ disabledList.put(label, altString);
}
public Map<String, String> disabledCommands()
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 5e9fbee56..49c09fe90 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -308,7 +308,7 @@ public class Essentials extends JavaPlugin implements IEssentials
final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel);
if (pc != null)
{
- alternativeCommandsHandler.executed(commandLabel, pc.getLabel());
+ alternativeCommandsHandler.executed(commandLabel, pc);
try
{
return pc.execute(sender, commandLabel, args);