minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-16 11:37:30 +02:00
Code Issues Releases Wiki Activity

porting e73983649f :: Ban cleanup

Browse Source
This commit is contained in:
Iaccidentally
2013-01-09 16:41:05 -05:00
parent 00237ae74f
commit cb819f37e9
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/messages.properties
View File

@@ -25,7 +25,7 @@ balanceTop=\u00a76Top balances ({0})
baltopHidden=\u00a76You are now hidden in /balancetop. baltopHidden=\u00a76You are now hidden in /balancetop.
baltopShown=\u00a76You are now shown in /balancetop. baltopShown=\u00a76You are now shown in /balancetop.
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.

10
Essentials/src/net/ess3/commands/Commandban.java
View File

@@ -1,13 +1,14 @@
package net.ess3.commands; package net.ess3.commands;
import static net.ess3.I18n._;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import net.ess3.Console; import net.ess3.Console;
import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import net.ess3.user.Ban; import net.ess3.user.Ban;
import net.ess3.user.UserData; 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 public class Commandban extends EssentialsCommand
@@ -44,7 +45,7 @@ public class Commandban extends EssentialsCommand
if (args.length > 1) 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); userData.getBan().setReason(banReason);
} }
else else
@@ -55,6 +56,7 @@ public class Commandban extends EssentialsCommand
user.setBanned(true); user.setBanned(true);
user.queueSave(); user.queueSave();
user.getData().getBan().setTimeout(0);
user.getPlayer().kickPlayer(banReason); user.getPlayer().kickPlayer(banReason);
for (Player player : server.getOnlinePlayers()) for (Player player : server.getOnlinePlayers())
{ {

3
Essentials/src/net/ess3/commands/Commandkick.java
View File

@@ -4,6 +4,7 @@ import net.ess3.Console;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import net.ess3.utils.FormatUtil;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -24,7 +25,7 @@ public class Commandkick extends EssentialsCommand
throw new Exception(_("kickExempt")); throw new Exception(_("kickExempt"));
} }
String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("kickDefault"); 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); user.getPlayer().kickPlayer(kickReason);
final String senderName = sender instanceof IUser ? ((IUser)sender).getPlayer().getDisplayName() : Console.NAME; final String senderName = sender instanceof IUser ? ((IUser)sender).getPlayer().getDisplayName() : Console.NAME;

3
Essentials/src/net/ess3/commands/Commandkickall.java
View File

@@ -2,6 +2,7 @@ package net.ess3.commands;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.utils.FormatUtil;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; 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 protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("kickDefault"); 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()) for (Player onlinePlayer : server.getOnlinePlayers())
{ {
if (sender instanceof IUser && onlinePlayer.getName().equalsIgnoreCase(((Player)sender).getName())) if (sender instanceof IUser && onlinePlayer.getName().equalsIgnoreCase(((Player)sender).getName()))

1
Essentials/src/net/ess3/commands/Commandunban.java
View File

@@ -19,6 +19,7 @@ public class Commandunban extends EssentialsCommand
final IUser player = ess.getUserMap().matchUser(args[0], true); final IUser player = ess.getUserMap().matchUser(args[0], true);
player.getData().setBan(null); player.getData().setBan(null);
player.setBanned(false); player.setBanned(false);
player.getData().getBan().setTimeout(0);
player.queueSave(); player.queueSave();
sender.sendMessage(_("unbannedPlayer")); sender.sendMessage(_("unbannedPlayer"));
} }