TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-07-15 18:24:05 +00:00
Code Issues Projects Releases Wiki Activity

Extract user match looping

Browse source
This commit is contained in:
KHobbits 2013-09-28 17:21:16 +01:00
parent e6b76cadbc
commit 03368e45df
14 changed files with 381 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Essentials/src/com/earth2me/essentials/commands/Commandext.java
View file

@ -2,13 +2,12 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User;
import java.util.List;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class Commandext extends EssentialsCommand
public class Commandext extends EssentialsLoopCommand
{
public Commandext()
{
@ -23,7 +22,7 @@ public class Commandext extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
extinguishPlayers(server, sender, args[0]);
loopOnlinePlayers(server, sender, true, args[0], null);
}
@Override
@ -31,7 +30,7 @@ public class Commandext extends EssentialsCommand
{
if (args.length < 1)
{
user.setFireTicks(0);
extPlayer(user.getBase());
user.sendMessage(_("extinguish"));
return;
}
@ -41,28 +40,18 @@ public class Commandext extends EssentialsCommand
throw new PlayerNotFoundException();
}
extinguishPlayers(server, user.getBase(), args[0]);
loopOnlinePlayers(server, user.getBase(), true, args[0], null);
}
private void extinguishPlayers(final Server server, final CommandSender sender, final String name) throws Exception
@Override
protected void updatePlayer(final Server server, final CommandSender sender, final User player, final String[] args)
{
boolean skipHidden = sender instanceof Player && !ess.getUser(sender).isAuthorized("essentials.vanish.interact");
boolean foundUser = false;
final List<Player> matchedPlayers = server.matchPlayer(name);
for (Player matchPlayer : matchedPlayers)
{
final User player = ess.getUser(matchPlayer);
if (skipHidden && player.isHidden())
{
continue;
}
foundUser = true;
matchPlayer.setFireTicks(0);
sender.sendMessage(_("extinguishOthers", matchPlayer.getDisplayName()));
}
if (!foundUser)
{
throw new PlayerNotFoundException();
}
extPlayer(player.getBase());
sender.sendMessage(_("extinguishOthers", player.getDisplayName()));
}
private void extPlayer(final Player player)
{
player.setFireTicks(0);
}
}