TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-08 05:23:12 +00:00
Code Issues Projects Releases Wiki Activity

Try and make toggles DRYer without loosing command flow.

Browse source 
Allow socialspy to match multiple players.
This commit is contained in:
KHobbits 2013-06-08 12:53:23 +01:00
parent 34daa5691c
commit a3e6996ef9
6 changed files with 215 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

114
Essentials/src/com/earth2me/essentials/commands/Commandfly.java
View file

@ -2,28 +2,21 @@ 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 Commandfly extends EssentialsCommand
public class Commandfly extends EssentialsToggleCommand
{
public Commandfly()
{
super("fly");
super("fly", "essentials.fly.others");
}
@Override
protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{
if (args.length < 1)
{
throw new NotEnoughArgumentsException();
}
flyOtherPlayers(server, sender, args);
toggleOtherPlayers(server, sender, args);
}
@Override
@ -31,82 +24,45 @@ public class Commandfly extends EssentialsCommand
{
if (args.length == 1)
{
if (args[0].equalsIgnoreCase("on") || args[0].startsWith("ena") || args[0].equalsIgnoreCase("1"))
Boolean toggle = matchToggleArgument(args[0]);
if (toggle == null && user.isAuthorized(othersPermission))
{
user.setAllowFlight(true);
}
else if (args[0].equalsIgnoreCase("off") || args[0].startsWith("dis") || args[0].equalsIgnoreCase("0"))
{
user.setAllowFlight(false);
}
else if (user.isAuthorized("essentials.fly.others"))
{
if (args[0].trim().length() < 2)
{
throw new Exception(_("playerNotFound"));
}
flyOtherPlayers(server, user, args);
return;
}
}
else if (args.length == 2 && user.isAuthorized("essentials.fly.others"))
{
if (args[0].trim().length() < 2)
{
throw new Exception(_("playerNotFound"));
}
flyOtherPlayers(server, user, args);
return;
}
else
{
user.setAllowFlight(!user.getAllowFlight());
if (!user.getAllowFlight())
{
user.setFlying(false);
}
}
user.sendMessage(_("flyMode", _(user.getAllowFlight() ? "enabled" : "disabled"), user.getDisplayName()));
}
private void flyOtherPlayers(final Server server, final CommandSender sender, final String[] args) throws NotEnoughArgumentsException
{
boolean skipHidden = sender instanceof Player && !ess.getUser(sender).isAuthorized("essentials.vanish.interact");
boolean foundUser = false;
final List<Player> matchedPlayers = server.matchPlayer(args[0]);
for (Player matchPlayer : matchedPlayers)
{
final User player = ess.getUser(matchPlayer);
if (skipHidden && player.isHidden())
{
continue;
}
foundUser = true;
if (args.length > 1)
{
if (args[1].contains("on") || args[1].contains("ena") || args[1].equalsIgnoreCase("1"))
{
player.setAllowFlight(true);
}
else
{
player.setAllowFlight(false);
}
toggleOtherPlayers(server, user, args);
}
else
{
player.setAllowFlight(!player.getAllowFlight());
togglePlayer(user, user, toggle);
}
if (!player.getAllowFlight())
{
player.setFlying(false);
}
sender.sendMessage(_("flyMode", _(player.getAllowFlight() ? "enabled" : "disabled"), player.getDisplayName()));
}
if (!foundUser)
else if (args.length == 2 && user.isAuthorized(othersPermission))
{
throw new NotEnoughArgumentsException(_("playerNotFound"));
toggleOtherPlayers(server, user, args);
}
else
{
togglePlayer(user, user, null);
}
}
@Override
void togglePlayer(CommandSender sender, User user, Boolean enabled)
{
if (enabled == null)
{
enabled = !user.getAllowFlight();
}
user.setAllowFlight(enabled);
if (!user.getAllowFlight())
{
user.setFlying(false);
}
user.sendMessage(_("flyMode", _(enabled ? "enabled" : "disabled"), user.getDisplayName()));
if (!sender.equals(user))
{
sender.sendMessage(_("flyMode", _(enabled ? "enabled" : "disabled"), user.getDisplayName()));
}
}
}