summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2014-06-14 22:06:26 +0100
committerKHobbits <rob@khobbits.co.uk>2014-06-14 22:06:26 +0100
commit32c61c2e915e66516ec374db2c3caf9c27ddf51e (patch)
tree2bae40c5b807efa60c56a911d1c526f389bd75d7
parente1852795ea1db4a926a35a642ce9b142ef48bbfe (diff)
downloadEssentials-32c61c2e915e66516ec374db2c3caf9c27ddf51e.tar
Essentials-32c61c2e915e66516ec374db2c3caf9c27ddf51e.tar.gz
Essentials-32c61c2e915e66516ec374db2c3caf9c27ddf51e.tar.lz
Essentials-32c61c2e915e66516ec374db2c3caf9c27ddf51e.tar.xz
Essentials-32c61c2e915e66516ec374db2c3caf9c27ddf51e.zip
Add default ban reason for tempban reason.
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtempban.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
index 2ec7d9962..478c2c257 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
@@ -44,7 +44,8 @@ public class Commandtempban extends EssentialsCommand
}
final String time = getFinalArg(args, 1);
final long banTimestamp = DateUtil.parseDateDiff(time, true);
- final String stringDregs = DateUtil.removeTimePattern(time);
+ String stringDregs = 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")))
@@ -52,6 +53,11 @@ public class Commandtempban extends EssentialsCommand
sender.sendMessage(tl("oversizedTempban"));
throw new NoChargeException();
}
+
+ if (stringDregs.length() < 2)
+ {
+ stringDregs = tl("defaultBanReason");
+ }
final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
final String banReason = tl("tempBanned", DateUtil.formatDateDiff(banTimestamp), senderName, stringDregs);