offline player validation for banning

This commit is contained in:
ementalo 2011-07-15 22:58:03 +01:00
parent 4dc92a144e
commit f104c2e8f6
2 changed files with 13 additions and 17 deletions

View File

@ -26,26 +26,20 @@ public class Commandban extends EssentialsCommand
sender.sendMessage(Util.i18n("banExempt")); sender.sendMessage(Util.i18n("banExempt"));
return; return;
} }
if (server.matchPlayer(args[0]).isEmpty())
String banReason;
if (args.length > 1)
{ {
ess.getBans().banByName(args[0]); banReason = getFinalArg(args, 1);
server.broadcastMessage(Util.format("playerBanned", args[0], Util.i18n("defaultBanReason"))); player.setBanReason(commandLabel);
} }
else else
{ {
String banReason; banReason = Util.i18n("defaultBanReason");
if (args.length > 1)
{
banReason = getFinalArg(args, 1);
player.setBanReason(commandLabel);
}
else
{
banReason = Util.i18n("defaultBanReason");
}
player.kickPlayer(banReason);
ess.getBans().banByName(args[0]);
server.broadcastMessage(Util.format("playerBanned", player.getName(), banReason));
} }
player.kickPlayer(banReason);
ess.getBans().banByName(player.getName());
server.broadcastMessage(Util.format("playerBanned", player.getName(), banReason));
} }
} }

View File

@ -1,5 +1,6 @@
package com.earth2me.essentials.commands; package com.earth2me.essentials.commands;
import com.earth2me.essentials.User;
import com.earth2me.essentials.Util; import com.earth2me.essentials.Util;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -20,7 +21,8 @@ public class Commandunban extends EssentialsCommand
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
ess.getBans().unbanByName(args[0]); User u = getPlayer(server, args, 0, true);
ess.getBans().unbanByName(u.getName());
sender.sendMessage(Util.i18n("unbannedPlayer")); sender.sendMessage(Util.i18n("unbannedPlayer"));
} }
} }