1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-16 03:24:31 +02:00

@khobbits Add optional 2n'd param to temp ban reason TL key.

This commit is contained in:
ementalo
2012-06-26 00:07:33 +01:00
parent a9fae0faad
commit 01f2b93abc

View File

@@ -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);