From 01f2b93abc388eb16459166420a7140532496c06 Mon Sep 17 00:00:00 2001 From: ementalo Date: Tue, 26 Jun 2012 00:07:33 +0100 Subject: [PATCH] @khobbits Add optional 2n'd param to temp ban reason TL key. --- .../com/earth2me/essentials/commands/Commandban.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java index d9d080441..1bf3bded2 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java @@ -24,7 +24,7 @@ public class Commandban extends EssentialsCommand final IUser user = getPlayer(args, 0, true); if (!user.isOnline()) { - if (Permissions.BAN_EXEMPT.isAuthorized(user)) + if (sender instanceof Player && Permissions.BAN_OFFLINE.isAuthorized(user)) { sender.sendMessage(_("banExempt")); return; @@ -32,7 +32,7 @@ public class Commandban extends EssentialsCommand } else { - if (Permissions.BAN_OFFLINE.isAuthorized(sender)) + if (Permissions.BAN_EXEMPT.isAuthorized(sender)) { sender.sendMessage(_("banExempt")); return; @@ -40,23 +40,23 @@ public class Commandban extends EssentialsCommand } user.acquireWriteLock(); + final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME; String banReason; user.getData().setBan(new Ban()); if (args.length > 1) { - banReason = getFinalArg(args, 1); + + banReason = _("banFormat", getFinalArg(args, 1), senderName); user.getData().getBan().setReason(banReason); } else { - banReason = _("defaultBanReason"); + banReason = _("banFormat", _("defaultBanReason"), senderName); user.getData().getBan().setReason(""); } user.setBanned(true); user.kickPlayer(banReason); - final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME; - for (Player onlinePlayer : server.getOnlinePlayers()) { final IUser player = ess.getUser(onlinePlayer);