diff options
author | KHobbits <rob@khobbits.co.uk> | 2014-07-12 17:47:39 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2014-07-12 19:13:23 +0100 |
commit | a44275af7d094ef9cf08ec7115248742d2b15dd7 (patch) | |
tree | 65eb74d3014dbb750563b08858f039548a19d6a6 /Essentials/src/com/earth2me/essentials/commands/Commandtempban.java | |
parent | 6d8d3a486f76921433067c77589ca09b598979fa (diff) | |
download | Essentials-a44275af7d094ef9cf08ec7115248742d2b15dd7.tar Essentials-a44275af7d094ef9cf08ec7115248742d2b15dd7.tar.gz Essentials-a44275af7d094ef9cf08ec7115248742d2b15dd7.tar.lz Essentials-a44275af7d094ef9cf08ec7115248742d2b15dd7.tar.xz Essentials-a44275af7d094ef9cf08ec7115248742d2b15dd7.zip |
Remove ban check from /ess cleanup, no longer required.
Fix ban upgrade script.
Diffstat (limited to 'Essentials/src/com/earth2me/essentials/commands/Commandtempban.java')
-rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandtempban.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java index aeaf4dbd8..dfb0139f1 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java @@ -47,8 +47,8 @@ public class Commandtempban extends EssentialsCommand } final String time = getFinalArg(args, 1); final long banTimestamp = DateUtil.parseDateDiff(time, true); - String stringDregs = DateUtil.removeTimePattern(time); - + String banReason = DateUtil.removeTimePattern(time); + final long maxBanLength = ess.getSettings().getMaxTempban() * 1000; if (maxBanLength > 0 && ((banTimestamp - GregorianCalendar.getInstance().getTimeInMillis()) > maxBanLength) && sender.isPlayer() && !(ess.getUser(sender.getPlayer()).isAuthorized("essentials.tempban.unlimited"))) @@ -56,17 +56,18 @@ public class Commandtempban extends EssentialsCommand sender.sendMessage(tl("oversizedTempban")); throw new NoChargeException(); } - - if (stringDregs.length() < 2) + + if (banReason.length() < 2) { - stringDregs = tl("defaultBanReason"); + banReason = tl("defaultBanReason"); } final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME; - final String banReason = tl("tempBanned", DateUtil.formatDateDiff(banTimestamp), senderName, stringDregs); - Bukkit.getBanList(BanList.Type.NAME).addBan(user.getName(), banReason, new Date(banTimestamp), senderName); - user.getBase().kickPlayer(banReason); + + String banDisplay = tl("tempBanned", DateUtil.formatDateDiff(banTimestamp), senderName, banReason); + user.getBase().kickPlayer(banDisplay); + server.getLogger().log(Level.INFO, tl("playerBanned", senderName, user.getName(), banDisplay)); final String message = tl("playerBanned", senderName, user.getName(), banReason, DateUtil.formatDateDiff(banTimestamp)); server.getLogger().log(Level.INFO, message); |