From cb819f37e95e02810f78b58c2b1890865b1089c5 Mon Sep 17 00:00:00 2001 From: Iaccidentally Date: Wed, 9 Jan 2013 16:41:05 -0500 Subject: porting e73983649f776315dd39916fa8b6d1236eaf1e7d :: Ban cleanup --- Essentials/src/messages.properties | 2 +- Essentials/src/net/ess3/commands/Commandban.java | 10 ++++++---- Essentials/src/net/ess3/commands/Commandkick.java | 3 ++- Essentials/src/net/ess3/commands/Commandkickall.java | 3 ++- Essentials/src/net/ess3/commands/Commandunban.java | 1 + 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 61c30e1d0..29095b7c1 100755 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -25,7 +25,7 @@ balanceTop=\u00a76Top balances ({0}) baltopHidden=\u00a76You are now hidden in /balancetop. baltopShown=\u00a76You are now shown in /balancetop. banExempt=\u00a74You can not ban that player. -banFormat=Banned: {0} +banFormat=\u00a74Banned:\n\u00a7r{0} banIpAddress=\u00a76Banned IP address bigTreeFailure=\u00a74Big tree generation failure. Try again on grass or dirt. bigTreeSuccess= \u00a76Big tree spawned. diff --git a/Essentials/src/net/ess3/commands/Commandban.java b/Essentials/src/net/ess3/commands/Commandban.java index d00cdb449..11c70a9c7 100644 --- a/Essentials/src/net/ess3/commands/Commandban.java +++ b/Essentials/src/net/ess3/commands/Commandban.java @@ -1,13 +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.FormatUtil; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandban extends EssentialsCommand @@ -44,7 +45,7 @@ public class Commandban extends EssentialsCommand if (args.length > 1) { - banReason = _("banFormat", getFinalArg(args, 1), senderName); + banReason = _("banFormat", FormatUtil.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n")), senderName); userData.getBan().setReason(banReason); } else @@ -55,6 +56,7 @@ public class Commandban extends EssentialsCommand user.setBanned(true); user.queueSave(); + user.getData().getBan().setTimeout(0); user.getPlayer().kickPlayer(banReason); for (Player player : server.getOnlinePlayers()) { diff --git a/Essentials/src/net/ess3/commands/Commandkick.java b/Essentials/src/net/ess3/commands/Commandkick.java index 5cf57b659..dc03531d8 100644 --- a/Essentials/src/net/ess3/commands/Commandkick.java +++ b/Essentials/src/net/ess3/commands/Commandkick.java @@ -4,6 +4,7 @@ import net.ess3.Console; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; +import net.ess3.utils.FormatUtil; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -24,7 +25,7 @@ public class Commandkick extends EssentialsCommand throw new Exception(_("kickExempt")); } String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("kickDefault"); - kickReason = kickReason.replace("\\n", "\n"); + kickReason = FormatUtil.replaceFormat(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 1c038a712..2d0700826 100644 --- a/Essentials/src/net/ess3/commands/Commandkickall.java +++ b/Essentials/src/net/ess3/commands/Commandkickall.java @@ -2,6 +2,7 @@ package net.ess3.commands; import static net.ess3.I18n._; import net.ess3.api.IUser; +import net.ess3.utils.FormatUtil; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -12,7 +13,7 @@ public class Commandkickall extends EssentialsCommand 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"); + kickReason = FormatUtil.replaceFormat(kickReason.replace("\\n", "\n")); for (Player onlinePlayer : server.getOnlinePlayers()) { if (sender instanceof IUser && onlinePlayer.getName().equalsIgnoreCase(((Player)sender).getName())) diff --git a/Essentials/src/net/ess3/commands/Commandunban.java b/Essentials/src/net/ess3/commands/Commandunban.java index ad4351c64..256125046 100644 --- a/Essentials/src/net/ess3/commands/Commandunban.java +++ b/Essentials/src/net/ess3/commands/Commandunban.java @@ -19,6 +19,7 @@ public class Commandunban extends EssentialsCommand final IUser player = ess.getUserMap().matchUser(args[0], true); player.getData().setBan(null); player.setBanned(false); + player.getData().getBan().setTimeout(0); player.queueSave(); sender.sendMessage(_("unbannedPlayer")); } -- cgit v1.2.3