[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

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);
 			}
 		}