diff options
| author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-22 21:01:23 +0000 |
|---|---|---|
| committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-22 21:01:23 +0000 |
| commit | 64eda9b295af8ac19bb1c4d089c294924c793765 (patch) | |
| tree | ebee7bc51dca6a12584acc5dc8bbe8d1a71e25bf | |
| parent | 5c10b96609d46fbd281c5544cf20c20896989591 (diff) | |
| download | Essentials-64eda9b295af8ac19bb1c4d089c294924c793765.tar Essentials-64eda9b295af8ac19bb1c4d089c294924c793765.tar.gz Essentials-64eda9b295af8ac19bb1c4d089c294924c793765.tar.lz Essentials-64eda9b295af8ac19bb1c4d089c294924c793765.tar.xz Essentials-64eda9b295af8ac19bb1c4d089c294924c793765.zip | |
Revoke last commit. It's not broken.
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1524 e251c2fe-e539-e718-e476-b85c1f46cddb
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Essentials.java | 5 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Settings.java | 3 | ||||
| -rw-r--r-- | Essentials/src/config.yml | 5 |
3 files changed, 4 insertions, 9 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index a03b6984a..fde60aeba 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/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 { diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index cde2ac409..862c559e1 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/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) { diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index 4a99c7192..8fffa244b 100644 --- a/Essentials/src/config.yml +++ b/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: |