summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-12-14 05:33:40 -0800
committerKHobbits <rob@khobbits.co.uk>2012-12-14 05:33:40 -0800
commitc947de28304c14f8cb55a300129b33dc9dad68cc (patch)
tree62b4fe48ff2f1257826fb53130ea257cecec2ec0
parentc5dccc52290abaf5867ed42a045baec89c9955a8 (diff)
parent69fca5c25169b0bb2d11327aa883077b571caeec (diff)
downloadEssentials-c947de28304c14f8cb55a300129b33dc9dad68cc.tar
Essentials-c947de28304c14f8cb55a300129b33dc9dad68cc.tar.gz
Essentials-c947de28304c14f8cb55a300129b33dc9dad68cc.tar.lz
Essentials-c947de28304c14f8cb55a300129b33dc9dad68cc.tar.xz
Essentials-c947de28304c14f8cb55a300129b33dc9dad68cc.zip
Merge pull request #213 from chrisgward/patch-2
Fix bans, add console override to exempt node
-rw-r--r--Essentials/src/net/ess3/commands/Commandban.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/Essentials/src/net/ess3/commands/Commandban.java b/Essentials/src/net/ess3/commands/Commandban.java
index c96e21276..bc19e864c 100644
--- a/Essentials/src/net/ess3/commands/Commandban.java
+++ b/Essentials/src/net/ess3/commands/Commandban.java
@@ -21,7 +21,7 @@ public class Commandban extends EssentialsCommand
final IUser user = ess.getUserMap().matchUser(args[0], true);
if (!user.isOnline())
{
- if (isUser(sender) && Permissions.BAN_OFFLINE.isAuthorized(user))
+ if (isUser(sender) && Permissions.BAN_OFFLINE.isAuthorized(sender))
{
sender.sendMessage(_("banExempt"));
return;
@@ -29,7 +29,7 @@ public class Commandban extends EssentialsCommand
}
else
{
- if (Permissions.BAN_EXEMPT.isAuthorized(sender))
+ if (isUser(sender) && Permissions.BAN_EXEMPT.isAuthorized(user))
{
sender.sendMessage(_("banExempt"));
return;