Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-02-10 01:11:22 +01:00
Code Issues Projects Releases Wiki Activity

Ban cleanup

Browse Source
This commit is contained in:
KHobbits 2013-01-09 21:31:56 +00:00
parent 465cdae989
commit e73983649f
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import com.earth2me.essentials.Console;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.OfflinePlayer; import com.earth2me.essentials.OfflinePlayer;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.Util;
import java.util.logging.Level; import java.util.logging.Level;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -57,7 +58,7 @@ public class Commandban extends EssentialsCommand
String banReason; String banReason;
if (args.length > 1) if (args.length > 1)
{ {
banReason = _("banFormat", getFinalArg(args, 1), senderName); banReason = _("banFormat", Util.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n")), senderName);
} }
else else
{ {
@ -66,6 +67,7 @@ public class Commandban extends EssentialsCommand
user.setBanReason(banReason); user.setBanReason(banReason);
user.setBanned(true); user.setBanned(true);
user.setBanTimeout(0);
user.kickPlayer(banReason); user.kickPlayer(banReason);
server.getLogger().log(Level.INFO, _("playerBanned", senderName, user.getName(), banReason)); server.getLogger().log(Level.INFO, _("playerBanned", senderName, user.getName(), banReason));

3
Essentials/src/com/earth2me/essentials/commands/Commandkick.java
View File

@ -3,6 +3,7 @@ package com.earth2me.essentials.commands;
import com.earth2me.essentials.Console; import com.earth2me.essentials.Console;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.Util;
import java.util.logging.Level; import java.util.logging.Level;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -39,7 +40,7 @@ public class Commandkick extends EssentialsCommand
} }
String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("kickDefault"); String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("kickDefault");
kickReason = kickReason.replace("\\n", "\n"); kickReason = Util.replaceFormat(kickReason.replace("\\n", "\n"));
target.kickPlayer(kickReason); target.kickPlayer(kickReason);
final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME; final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;

3
Essentials/src/com/earth2me/essentials/commands/Commandkickall.java
View File

@ -1,6 +1,7 @@
package com.earth2me.essentials.commands; package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.Util;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -17,7 +18,7 @@ public class Commandkickall extends EssentialsCommand
public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
String kickReason = args.length > 0 ? getFinalArg(args, 0) : _("kickDefault"); String kickReason = args.length > 0 ? getFinalArg(args, 0) : _("kickDefault");
kickReason = kickReason.replace("\\n", "\n"); kickReason = Util.replaceFormat(kickReason.replace("\\n", "\n"));
for (Player onlinePlayer : server.getOnlinePlayers()) for (Player onlinePlayer : server.getOnlinePlayers())
{ {

1
Essentials/src/com/earth2me/essentials/commands/Commandunban.java
View File

@ -26,6 +26,7 @@ public class Commandunban extends EssentialsCommand
{ {
final User user = getPlayer(server, args, 0, true); final User user = getPlayer(server, args, 0, true);
user.setBanned(false); user.setBanned(false);
user.setBanTimeout(0);
sender.sendMessage(_("unbannedPlayer")); sender.sendMessage(_("unbannedPlayer"));
} }
catch (NoSuchFieldException e) catch (NoSuchFieldException e)

2
Essentials/src/messages.properties
View File

@ -23,7 +23,7 @@ backupStarted=\u00a76Backup started
balance=\u00a7aBalance:\u00a7c {0} balance=\u00a7aBalance:\u00a7c {0}
balanceTop=\u00a76Top balances ({0}) balanceTop=\u00a76Top balances ({0})
banExempt=\u00a74You can not ban that player. banExempt=\u00a74You can not ban that player.
banFormat=Banned: {0} banFormat=\u00a74Banned:\n\u00a7r{0}
banIpAddress=\u00a76Banned IP address banIpAddress=\u00a76Banned IP address
bigTreeFailure=\u00a74Big tree generation failure. Try again on grass or dirt. bigTreeFailure=\u00a74Big tree generation failure. Try again on grass or dirt.
bigTreeSuccess= \u00a76Big tree spawned. bigTreeSuccess= \u00a76Big tree spawned.

2
Essentials/src/messages_en.properties
View File

@ -23,7 +23,7 @@ backupStarted=\u00a76Backup started
balance=\u00a7aBalance:\u00a7c {0} balance=\u00a7aBalance:\u00a7c {0}
balanceTop=\u00a76Top balances ({0}) balanceTop=\u00a76Top balances ({0})
banExempt=\u00a74You can not ban that player. banExempt=\u00a74You can not ban that player.
banFormat=Banned: {0} banFormat=\u00a74Banned:\n\u00a7r{0}
banIpAddress=\u00a76Banned IP address banIpAddress=\u00a76Banned IP address
bigTreeFailure=\u00a74Big tree generation failure. Try again on grass or dirt. bigTreeFailure=\u00a74Big tree generation failure. Try again on grass or dirt.
bigTreeSuccess= \u00a76Big tree spawned. bigTreeSuccess= \u00a76Big tree spawned.