Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-09-30 00:27:26 +02:00
Code Issues Projects Releases Wiki Activity

Revoke last commit. It's not broken.

Browse Source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1524 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-05-22 21:01:23 +00:00
parent 5c10b96609
commit 64eda9b295
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Essentials/src/com/earth2me/essentials/Essentials.java
View File

@ -353,8 +353,7 @@ public class Essentials extends JavaPlugin
} }
} }
// Allow plugins to override the command via onCommand // 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()) 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); return getServer().getPluginCommand(p.getDescription().getName() + ":" + commandLabel).execute(sender, commandLabel, args);
} }
}*/ }
try try
{ {

3
Essentials/src/com/earth2me/essentials/Settings.java
View File

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

5
Essentials/src/config.yml
View File

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