Extract user match looping

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

View file

@ -2,15 +2,16 @@ 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.LightningStrike;
import org.bukkit.entity.Player;
public class Commandlightning extends EssentialsCommand
public class Commandlightning extends EssentialsLoopCommand
{
int power = 5;
public Commandlightning()
{
super("lightning");
@ -19,7 +20,6 @@ public class Commandlightning extends EssentialsCommand
@Override
public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{
User user = null;
if (sender instanceof Player)
{
@ -31,7 +31,6 @@ public class Commandlightning extends EssentialsCommand
}
}
int power = 5;
if (args.length > 1)
{
try
@ -42,28 +41,22 @@ public class Commandlightning extends EssentialsCommand
{
}
}
loopOnlinePlayers(server, sender, true, args[0], null);
}
if (args[0].trim().length() < 2)
@Override
protected void updatePlayer(final Server server, final CommandSender sender, final User matchUser, final String[] args)
{
sender.sendMessage(_("lightningUse", matchUser.getDisplayName()));
final LightningStrike strike = matchUser.getBase().getWorld().strikeLightningEffect(matchUser.getBase().getLocation());
if (!matchUser.isGodModeEnabled())
{
throw new PlayerNotFoundException();
matchUser.getBase().damage(power, strike);
}
final List<Player> matchedPlayers = server.matchPlayer(args[0]);
for (Player matchPlayer : matchedPlayers)
if (ess.getSettings().warnOnSmite())
{
User matchUser = ess.getUser(matchPlayer);
sender.sendMessage(_("lightningUse", matchPlayer.getDisplayName()));
final LightningStrike strike = matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
if (!matchUser.isGodModeEnabled())
{
matchPlayer.damage(power, strike);
}
if (ess.getSettings().warnOnSmite())
{
matchUser.sendMessage(_("lightningSmited"));
}
matchUser.sendMessage(_("lightningSmited"));
}
}
}