diff options
| author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-22 20:54:25 +0000 |
|---|---|---|
| committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-22 20:54:25 +0000 |
| commit | 5c10b96609d46fbd281c5544cf20c20896989591 (patch) | |
| tree | 8bc58538822a8f6b016ef7037ad1ff77a0b7f72b | |
| parent | c74467506332cc8aeb9e551e192c3a3e55aa5296 (diff) | |
| download | Essentials-5c10b96609d46fbd281c5544cf20c20896989591.tar Essentials-5c10b96609d46fbd281c5544cf20c20896989591.tar.gz Essentials-5c10b96609d46fbd281c5544cf20c20896989591.tar.lz Essentials-5c10b96609d46fbd281c5544cf20c20896989591.tar.xz Essentials-5c10b96609d46fbd281c5544cf20c20896989591.zip | |
Bukkit broke the command override.
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1523 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, 9 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index fde60aeba..a03b6984a 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -353,7 +353,8 @@ public class Essentials extends JavaPlugin } } // Allow plugins to override the command via onCommand - if (!getSettings().isCommandOverridden(command.getName()) && !commandLabel.startsWith("e")) + // Removed because of changes in bukkit + /*if (!getSettings().isCommandOverridden(command.getName()) && !commandLabel.startsWith("e")) { for (Plugin p : getServer().getPluginManager().getPlugins()) { @@ -393,7 +394,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 862c559e1..cde2ac409 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -88,6 +88,8 @@ 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); @@ -100,6 +102,7 @@ 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 8fffa244b..4a99c7192 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -105,8 +105,9 @@ 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 +#overridden-commands: +# - god +# Attention: because of changes in bukkit, this won't work anymore. # Disabled commands will be completelly unavailable on the server. disabled-commands: |