minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-18 12:31:26 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
ementalo
2012-06-26 00:07:33 +01:00
parent a9fae0faad
commit 01f2b93abc
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Essentials/src/com/earth2me/essentials/commands/Commandban.java
View File

@@ -24,7 +24,7 @@ public class Commandban extends EssentialsCommand
final IUser user = getPlayer(args, 0, true); final IUser user = getPlayer(args, 0, true);
if (!user.isOnline()) if (!user.isOnline())
{ {
if (Permissions.BAN_EXEMPT.isAuthorized(user)) if (sender instanceof Player && Permissions.BAN_OFFLINE.isAuthorized(user))
{ {
sender.sendMessage(_("banExempt")); sender.sendMessage(_("banExempt"));
return; return;
@@ -32,7 +32,7 @@ public class Commandban extends EssentialsCommand
} }
else else
{ {
if (Permissions.BAN_OFFLINE.isAuthorized(sender)) if (Permissions.BAN_EXEMPT.isAuthorized(sender))
{ {
sender.sendMessage(_("banExempt")); sender.sendMessage(_("banExempt"));
return; return;
@@ -40,23 +40,23 @@ public class Commandban extends EssentialsCommand
} }
user.acquireWriteLock(); user.acquireWriteLock();
final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
String banReason; String banReason;
user.getData().setBan(new Ban()); user.getData().setBan(new Ban());
if (args.length > 1) if (args.length > 1)
{ {
banReason = getFinalArg(args, 1);
banReason = _("banFormat", getFinalArg(args, 1), senderName);
user.getData().getBan().setReason(banReason); user.getData().getBan().setReason(banReason);
} }
else else
{ {
banReason = _("defaultBanReason"); banReason = _("banFormat", _("defaultBanReason"), senderName);
user.getData().getBan().setReason(""); user.getData().getBan().setReason("");
} }
user.setBanned(true); user.setBanned(true);
user.kickPlayer(banReason); user.kickPlayer(banReason);
final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
for (Player onlinePlayer : server.getOnlinePlayers()) for (Player onlinePlayer : server.getOnlinePlayers())
{ {
final IUser player = ess.getUser(onlinePlayer); final IUser player = ess.getUser(onlinePlayer);