diff options
author | ementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-26 20:11:11 +0000 |
---|---|---|
committer | ementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-26 20:11:11 +0000 |
commit | 9b1e8e9841b851ae9c669ff12a491abc9b51c3ac (patch) | |
tree | 3fdd142bf1b4e1144c6361a9ed032edecf19e9b5 | |
parent | 042780d5e5302774d265e10a7089ac3bb870cb99 (diff) | |
download | Essentials-9b1e8e9841b851ae9c669ff12a491abc9b51c3ac.tar Essentials-9b1e8e9841b851ae9c669ff12a491abc9b51c3ac.tar.gz Essentials-9b1e8e9841b851ae9c669ff12a491abc9b51c3ac.tar.lz Essentials-9b1e8e9841b851ae9c669ff12a491abc9b51c3ac.tar.xz Essentials-9b1e8e9841b851ae9c669ff12a491abc9b51c3ac.zip |
[trunk] Initial fix to allow plugins to override essentials commands, looking into better way
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1540 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r-- | Essentials/src/com/earth2me/essentials/Essentials.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 9be14e1c4..3c0a35bba 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -29,7 +29,6 @@ import com.earth2me.essentials.commands.NotEnoughArgumentsException; import com.earth2me.essentials.register.payment.Methods; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.bukkit.command.PluginCommand; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.scheduler.CraftScheduler; import org.bukkit.entity.Player; @@ -383,15 +382,7 @@ public class Essentials extends JavaPlugin { continue; } - - PluginCommand pcmd = getServer().getPluginCommand(desc.getName() + ":" + commandLabel); - - if (pcmd == null) - { - continue; - } - - return getServer().getPluginCommand(p.getDescription().getName() + ":" + commandLabel).execute(sender, commandLabel, args); + return p.onCommand(sender, command, commandLabel, args); } } |