diff options
4 files changed, 25 insertions, 12 deletions
diff --git a/Essentials/src/net/ess3/commands/Commandkick.java b/Essentials/src/net/ess3/commands/Commandkick.java index 61e24c95d..5cf57b659 100644 --- a/Essentials/src/net/ess3/commands/Commandkick.java +++ b/Essentials/src/net/ess3/commands/Commandkick.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import net.ess3.Console; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandkick extends EssentialsCommand @@ -23,7 +23,8 @@ public class Commandkick extends EssentialsCommand { throw new Exception(_("kickExempt")); } - final String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("kickDefault"); + String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("kickDefault"); + kickReason = kickReason.replace("\\n", "\n"); user.getPlayer().kickPlayer(kickReason); final String senderName = sender instanceof IUser ? ((IUser)sender).getPlayer().getDisplayName() : Console.NAME; diff --git a/Essentials/src/net/ess3/commands/Commandkickall.java b/Essentials/src/net/ess3/commands/Commandkickall.java index cc0d135a7..1c038a712 100644 --- a/Essentials/src/net/ess3/commands/Commandkickall.java +++ b/Essentials/src/net/ess3/commands/Commandkickall.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; +import net.ess3.api.IUser; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import net.ess3.api.IUser; public class Commandkickall extends EssentialsCommand @@ -11,6 +11,8 @@ public class Commandkickall extends EssentialsCommand @Override protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception { + String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("kickDefault"); + kickReason = kickReason.replace("\\n", "\n"); for (Player onlinePlayer : server.getOnlinePlayers()) { if (sender instanceof IUser && onlinePlayer.getName().equalsIgnoreCase(((Player)sender).getName())) @@ -19,7 +21,7 @@ public class Commandkickall extends EssentialsCommand } else { - onlinePlayer.kickPlayer(args.length > 0 ? getFinalArg(args, 0) : _("kickDefault")); + onlinePlayer.kickPlayer(kickReason); } } } diff --git a/Essentials/src/net/ess3/commands/Commandtempban.java b/Essentials/src/net/ess3/commands/Commandtempban.java index b579c6992..3bd267095 100644 --- a/Essentials/src/net/ess3/commands/Commandtempban.java +++ b/Essentials/src/net/ess3/commands/Commandtempban.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import static net.ess3.I18n._; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import net.ess3.Console; +import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.Ban; import net.ess3.user.UserData; import net.ess3.utils.DateUtil; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandtempban extends EssentialsCommand diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java index 327e264b4..5f3182656 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java @@ -31,8 +31,10 @@ import net.ess3.api.IUserMap; import net.ess3.permissions.Permissions; import net.ess3.settings.Commands; import net.ess3.user.UserData.TimestampType; +import net.ess3.utils.DateUtil; import net.ess3.utils.FormatUtil; import net.ess3.utils.LocationUtil; +import net.ess3.utils.Util; import net.ess3.utils.textreader.*; @@ -376,9 +378,17 @@ public class EssentialsPlayerListener implements Listener if (!banExpired && (user.isBanned() || event.getResult() == Result.KICK_BANNED)) { - final String banReason = user.getData().getBan() == null ? "" : user.getData().getBan().getReason(); - event.disallow( - Result.KICK_BANNED, banReason == null || banReason.isEmpty() || banReason.equalsIgnoreCase("ban") ? _("defaultBanReason") : banReason); + String banReason = user.getData().getBan().getReason(); + if (banReason == null || banReason.isEmpty() || banReason.equalsIgnoreCase("ban")) + { + banReason = _("defaultBanReason"); + } + if (user.getData().getBan().getTimeout() > 0) + { + //TODO: TL This + banReason += "\n\n" + "Expires in " + DateUtil.formatDateDiff(user.getData().getBan().getTimeout()); + } + event.disallow(Result.KICK_BANNED, banReason); return; } |