From 02a718374e12cfc1f8dd27cafce1b95befd9d882 Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 1 May 2011 18:37:58 +0000 Subject: [PATCH] [trunk] /kickall , the reason is now optional, also fixes that only the first word is send as kick message. git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1296 e251c2fe-e539-e718-e476-b85c1f46cddb --- .../essentials/commands/Commandkickall.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java b/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java index e73f57a00..d03a805d5 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java @@ -16,13 +16,6 @@ public class Commandkickall extends EssentialsCommand @Override public void run(Server server, Essentials parent, User user, String commandLabel, String[] args) throws Exception { - if (args.length < 1) - { - user.sendMessage("ยง7Usage: /" + commandLabel + ""); - return; - } - - for (Player p : server.getOnlinePlayers()) { if (server.getOnlinePlayers().length == 1 && p.getName().equalsIgnoreCase(user.getName())) @@ -34,7 +27,7 @@ public class Commandkickall extends EssentialsCommand { if (!p.getName().equalsIgnoreCase(user.getName())) { - p.kickPlayer(args.length < 1 ? args[0] : "Kicked from server"); + p.kickPlayer(args.length < 1 ? getFinalArg(args, 0) : "Kicked from server"); } } } @@ -43,13 +36,9 @@ public class Commandkickall extends EssentialsCommand @Override public void run(Server server, Essentials parent, CommandSender sender, String commandLabel, String[] args) throws Exception { - if (args.length < 1) - { - sender.sendMessage("Usage: /" + commandLabel + ""); - return; - } - for (Player p : server.getOnlinePlayers()) - p.kickPlayer(args.length < 1 ? args[0] : "Kicked from server"); + { + p.kickPlayer(args.length < 1 ? getFinalArg(args, 0) : "Kicked from server"); + } } }