From 58bebd851c9d0e73633648a11a85eafda57bc451 Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 14 Dec 2011 15:07:08 +0100 Subject: [PATCH 1/3] Fix failing override for /enchant /eco /ext --- Essentials/src/com/earth2me/essentials/Essentials.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 5c0b1cdf8..e3971c747 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -294,7 +294,7 @@ public class Essentials extends JavaPlugin implements IEssentials public boolean onCommandEssentials(final CommandSender sender, final Command command, final String commandLabel, final String[] args, final ClassLoader classLoader, final String commandPath, final String permissionPrefix, final IEssentialsModule module) { // Allow plugins to override the command via onCommand - if (!getSettings().isCommandOverridden(command.getName()) && !commandLabel.startsWith("e")) + if (!getSettings().isCommandOverridden(command.getName()) && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName()))) { final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel); if (pc != null) From 64bc8d1133fa28e9895fd4186f4bec761e6a2844 Mon Sep 17 00:00:00 2001 From: snowleo Date: Thu, 15 Dec 2011 10:32:04 +0100 Subject: [PATCH 2/3] Corrected version match for 1597 build version --- Essentials/src/com/earth2me/essentials/Essentials.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index e3971c747..648a99ce3 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -124,7 +124,7 @@ public class Essentials extends JavaPlugin implements IEssentials LOGGER.log(Level.WARNING, _("versionMismatch", plugin.getDescription().getName())); } } - final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-R[0-9]+-[0-9]+-[0-9a-z]+-b([0-9]+)jnks.*").matcher(getServer().getVersion()); + final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-R[0-9]+-b([0-9]+)jnks.*").matcher(getServer().getVersion()); if (versionMatch.matches()) { final int versionNumber = Integer.parseInt(versionMatch.group(4)); From 01530192cfd10e3286105988b8fc5c7b82edceca Mon Sep 17 00:00:00 2001 From: KHobbits Date: Thu, 15 Dec 2011 20:47:06 +0000 Subject: [PATCH 3/3] Make powertool use a chat event, instead of just messaging each user. --- .../com/earth2me/essentials/EssentialsPlayerListener.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index a90e98013..bb6741d30 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -313,10 +313,7 @@ public class EssentialsPlayerListener extends PlayerListener } else if (command.startsWith("c:")) { - for (Player p : server.getOnlinePlayers()) - { - p.sendMessage(user.getDisplayName() + ":" + command.substring(2)); - } + user.chat(command.substring(2)); } else {