summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Schepp <schneeleo@gmail.com>2012-10-01 09:15:18 -0700
committerAlexander Schepp <schneeleo@gmail.com>2012-10-01 09:15:18 -0700
commit78f7d069b03f2e5fdfeffb3eeeea8354fbc998d6 (patch)
tree252aab0c993c8f4188f149d937a7b8b9d760d75e
parentc576af4d8f60ce0d04480eca460f5deb5a1e1bc3 (diff)
parenta8575bddef2fbcada9303435594b6e510f6cdcd3 (diff)
downloadEssentials-78f7d069b03f2e5fdfeffb3eeeea8354fbc998d6.tar
Essentials-78f7d069b03f2e5fdfeffb3eeeea8354fbc998d6.tar.gz
Essentials-78f7d069b03f2e5fdfeffb3eeeea8354fbc998d6.tar.lz
Essentials-78f7d069b03f2e5fdfeffb3eeeea8354fbc998d6.tar.xz
Essentials-78f7d069b03f2e5fdfeffb3eeeea8354fbc998d6.zip
Merge pull request #169 from chrisgward/patch-5
Adding console only overrides to exempts
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandban.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandsudo.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java
index 5f70df273..cf6ea53df 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java
@@ -44,7 +44,7 @@ public class Commandban extends EssentialsCommand
}
else
{
- if (user.isAuthorized("essentials.ban.exempt"))
+ if (user.isAuthorized("essentials.ban.exempt") && sender instanceof Player)
{
sender.sendMessage(_("banExempt"));
return;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java b/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java
index 1d974121b..89cfe2438 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java
@@ -7,6 +7,7 @@ import java.util.logging.Logger;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.command.PluginCommand;
+import org.bukkit.entity.Player;
public class Commandsudo extends EssentialsCommand
@@ -33,7 +34,7 @@ public class Commandsudo extends EssentialsCommand
System.arraycopy(args, 2, arguments, 0, args.length - 2);
}
- if (user.isAuthorized("essentials.sudo.exempt"))
+ if (user.isAuthorized("essentials.sudo.exempt") && sender instanceof Player)
{
throw new Exception(_("sudoExempt"));
}