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
commitd7ddf3c8282901b4ae6453da5bfb8bd12d482ae1 (patch)
tree95e29b9a7be73fa79fe936b57a1e2676108c5d9f
parent2b7cba936de8648bcdcf6dc35c95b73e3ca88244 (diff)
parentf50c5276e433b264b27f2cc72844071a34bab1cf (diff)
downloadEssentials-d7ddf3c8282901b4ae6453da5bfb8bd12d482ae1.tar
Essentials-d7ddf3c8282901b4ae6453da5bfb8bd12d482ae1.tar.gz
Essentials-d7ddf3c8282901b4ae6453da5bfb8bd12d482ae1.tar.lz
Essentials-d7ddf3c8282901b4ae6453da5bfb8bd12d482ae1.tar.xz
Essentials-d7ddf3c8282901b4ae6453da5bfb8bd12d482ae1.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"));
}