From 6cc742b1395e2efe8ede94bedd47aea5f5a531b1 Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 12 Jun 2011 17:51:16 +0200 Subject: Fix for calling command for plugins that are loaded after Essentials. --- Essentials/src/com/earth2me/essentials/Essentials.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 4b9e74d4e..901d55107 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -30,6 +30,7 @@ import com.earth2me.essentials.register.payment.Methods; import java.math.BigInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.bukkit.command.PluginCommand; import org.bukkit.craftbukkit.scheduler.CraftScheduler; import org.bukkit.entity.Player; import org.bukkit.event.Event.Priority; @@ -42,7 +43,7 @@ import org.bukkit.plugin.java.*; public class Essentials extends JavaPlugin implements IEssentials { public static final String AUTHORS = "Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans and Xeology"; - public static final int minBukkitBuildVersion = 860; + public static final int minBukkitBuildVersion = 867; private static final Logger logger = Logger.getLogger("Minecraft"); private Settings settings; private TNTExplodeListener tntListener; @@ -397,17 +398,10 @@ public class Essentials extends JavaPlugin implements IEssentials continue; } - if (!(desc.getCommands() instanceof Map)) - { - continue; - } - - Map cmds = (Map)desc.getCommands(); - if (!cmds.containsKey(command.getName())) - { - continue; + PluginCommand pc = getServer().getPluginCommand(desc.getName()+":"+commandLabel); + if (pc != null) { + return pc.execute(sender, commandLabel, args); } - return p.onCommand(sender, command, commandLabel, args); } } -- cgit v1.2.3