Revoke last commit. It's not broken.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1524 e251c2fe-e539-e718-e476-b85c1f46cddb

Essentials/src/com/earth2me/essentials/Essentials.java

@@ -353,8 +353,7 @@ public class Essentials extends JavaPlugin
 			}
 		}
 		// Allow plugins to override the command via onCommand
-		// Removed because of changes in bukkit
-		/*if (!getSettings().isCommandOverridden(command.getName()) && !commandLabel.startsWith("e"))
+		if (!getSettings().isCommandOverridden(command.getName()) && !commandLabel.startsWith("e"))
 		{
 			for (Plugin p : getServer().getPluginManager().getPlugins())
 			{
@@ -394,7 +393,7 @@ public class Essentials extends JavaPlugin
 
 				return getServer().getPluginCommand(p.getDescription().getName() + ":" + commandLabel).execute(sender, commandLabel, args);
 			}
-		}*/
+		}
 
 		try
 		{

Essentials/src/com/earth2me/essentials/Settings.java

@@ -88,8 +88,6 @@ public class Settings implements IConf
 		return config.getBoolean("restrict-" + label.toLowerCase(), false);
 	}
 
-	// Removed because of changes in bukkit
-	/*
 	public boolean isCommandOverridden(String name)
 	{
 		List<String> defaultList = new ArrayList<String>(1);
@@ -102,7 +100,6 @@ public class Settings implements IConf
 		}
 		return config.getBoolean("override-" + name.toLowerCase(), false);
 	}
-	*/
 
 	public int getCommandCost(IEssentialsCommand cmd)
 	{

Essentials/src/config.yml

@@ -105,9 +105,8 @@ rules:
 # such as /egod, will always grant Essentials priority.
 # We should try to take priority over /god.  If this doesn't work, use
 # /essentials:god or /egod.  If god is set using WorldGuard, use /ungod to remove then use whichever you see fit.
-#overridden-commands:
-#  - god
-# Attention: because of changes in bukkit, this won't work anymore.
+overridden-commands:
+  - god
 
 # Disabled commands will be completelly unavailable on the server.
 disabled-commands: