From 013dd1d2ccf99b7cec213def09035c66b233a75b Mon Sep 17 00:00:00 2001 From: Jerom van der Sar Date: Mon, 17 Sep 2012 21:57:52 +0200 Subject: [PATCH] Made /rd simpler --- .../TotalFreedomMod/Commands/Command_rd.java | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rd.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rd.java index 3a5e66ed..0478d78b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rd.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rd.java @@ -13,27 +13,14 @@ public class Command_rd extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (senderIsConsole || sender.isOp()) + if (!(senderIsConsole || TFM_Util.isUserSuperadmin(sender))) { - if (args.length == 1) - { - if (Arrays.asList("minecart", "minecarts", "cart", "carts").contains(args[0].toLowerCase())) - { - sender.sendMessage(ChatColor.GRAY + "Removing all projectiles, dropped items, exp. orbs, primed explosives, and minecarts."); - sender.sendMessage(ChatColor.GRAY + String.valueOf(TFM_Util.wipeEntities(true, true)) + " enties removed."); - } - } - else - { - sender.sendMessage(ChatColor.GRAY + "Removing all projectiles, dropped items, exp. orbs and primed explosives."); - sender.sendMessage(ChatColor.GRAY + String.valueOf(TFM_Util.wipeEntities(true)) + " enties removed."); - } + sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS); + return true; } - else - { - sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS); - } - + TFM_Util.adminAction(sender.getName(), "Removing all server entities", false); + sender.sendMessage(ChatColor.GRAY + String.valueOf(TFM_Util.wipeEntities(true, true)) + " enties removed."); + return true; } }