Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove /invis smite, add /invis clear #1011

Closed
wants to merge 3 commits into from
Closed

Remove /invis smite, add /invis clear #1011

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0b640f
Resolves #959
LegendIsAwesomes Dec 25, 2015
3d5b79d
Fixes parameters
LegendIsAwesomes Dec 28, 2015
428761b
Fix
LegendIsAwesomes Dec 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
import org.bukkit.potion.PotionEffectType;

@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
@CommandParameters(description = "Shows (optionally smites) invisisible players", usage = "/<command> (smite)")
@CommandParameters(description = "Shows (optionally clears) invisisible players", usage = "/<command> [clear]")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spelling typo.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LegendIsAwesomes May be something to fix while you're at it. :)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LegendIsAwesomes

public class Command_invis extends TFM_Command
{
@Override
public boolean run(CommandSender sender, Player sender_p, 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"))
{
TFM_Util.adminAction(sender.getName(), "Smiting all invisible players", true);
smite = true;
TFM_Util.adminAction(sender.getName(), "Clearing all invisible players", true);
clear = true;
}
else
{
Expand All @@ -32,17 +32,17 @@ public boolean run(CommandSender sender, Player sender_p, Command cmd, String co
}

List<String> players = new ArrayList<String>();
int smites = 0;
int clears = 0;

for (Player player : server.getOnlinePlayers())
{
if (player.hasPotionEffect(PotionEffectType.INVISIBILITY))
{
players.add(player.getName());
if (smite && !TFM_AdminList.isSuperAdmin(player))
if (clear && !TFM_AdminList.isSuperAdmin(player))
{
player.setHealth(0.0);
smites++;
player.removePotionEffect(PotionEffectType.INVISIBILITY);
clears++;
}
}
}
Expand All @@ -53,9 +53,9 @@ public boolean run(CommandSender sender, Player sender_p, Command cmd, String co
return true;
}

if (smite)
if (clear)
{
playerMsg("Smitten " + smites + " players");
playerMsg("Cleared invisibility effect from " + clears + " players");
}
else
{
Expand Down