From 0eb0c7a02f040f9347369518f94bcc1173cb719d Mon Sep 17 00:00:00 2001 From: LegendIsAwesomes Date: Sun, 13 Nov 2016 16:46:06 +0100 Subject: [PATCH] Remove /invis smite, add /invis clear. Resolves #959 (#1011) --- .../command/Command_invis.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java index 8fb8bb4b..f0267dca 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java @@ -11,20 +11,20 @@ import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffectType; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Shows (optionally smites) invisisible players", usage = "/ (smite)") +@CommandParameters(description = "Shows (and optionally clears) invisisible players", usage = "/ [clear]") public class Command_invis extends FreedomCommand { @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - boolean smite = false; + boolean clear = false; if (args.length >= 1) { - if (args[0].equalsIgnoreCase("smite")) + if (args[0].equalsIgnoreCase("clear")) { - FUtil.adminAction(sender.getName(), "Smiting all invisible players", true); - smite = true; + FUtil.adminAction(sender.getName(), "Clearing invisibility for all players", false); + clear = true; } else { @@ -33,17 +33,17 @@ public class Command_invis extends FreedomCommand } List players = new ArrayList<>(); - int smites = 0; + int clears = 0; for (Player player : server.getOnlinePlayers()) { if (player.hasPotionEffect(PotionEffectType.INVISIBILITY)) { players.add(player.getName()); - if (smite && !plugin.al.isAdmin(player)) + if (clear && !plugin.al.isAdmin(player)) { - player.setHealth(0.0); - smites++; + player.removePotionEffect(PotionEffectType.INVISIBILITY); + clears++; } } } @@ -54,9 +54,9 @@ public class Command_invis extends FreedomCommand return true; } - if (smite) + if (clear) { - msg("Smitten " + smites + " players"); + msg("Cleared invisibility effect from " + clears + " players"); } else {