From d01f9d0b2f8dbcaa64369433c04bb308f20ef58e Mon Sep 17 00:00:00 2001 From: Obi2kanobi Date: Sun, 28 Sep 2014 15:07:38 +0100 Subject: [PATCH] Smite players with /stfu -s. Fixes #325. --- .../TotalFreedomMod/Commands/Command_stfu.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java index 2e814d4..db10d1a 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java @@ -16,7 +16,7 @@ public class Command_stfu extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (args.length != 1) + if (args.length == 0 || args.length > 2) { return false; } @@ -98,6 +98,7 @@ public class Command_stfu extends TFM_Command } else { + final Player player = getPlayer(args[0]); if (player == null) @@ -115,10 +116,16 @@ public class Command_stfu extends TFM_Command } else { + if (!TFM_AdminList.isSuperAdmin(player)) { TFM_Util.adminAction(sender.getName(), "Muting " + player.getName(), true); playerdata.setMuted(true); + if (args.length == 2 && args[1].equalsIgnoreCase("-s")) + { + Command_smite.smite(player); + } + playerMsg("Muted " + player.getName()); } else