mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-08-05 03:53:41 +00:00
[Permission] essentials.vanish.interact - Players with this permission will be able to interact with hidden players.
This commit is contained in:
parent
896e14670f
commit
889157371c
12 changed files with 40 additions and 29 deletions
|
@ -117,12 +117,13 @@ public class Commandexp extends EssentialsCommand
|
||||||
|
|
||||||
private void showMatch(final Server server, final CommandSender sender, final String match) throws NotEnoughArgumentsException
|
private void showMatch(final Server server, final CommandSender sender, final String match) throws NotEnoughArgumentsException
|
||||||
{
|
{
|
||||||
|
boolean skipHidden = sender instanceof Player && !ess.getUser(sender).isAuthorized("essentials.vanish.interact");
|
||||||
boolean foundUser = false;
|
boolean foundUser = false;
|
||||||
final List<Player> matchedPlayers = server.matchPlayer(match);
|
final List<Player> matchedPlayers = server.matchPlayer(match);
|
||||||
for (Player matchPlayer : matchedPlayers)
|
for (Player matchPlayer : matchedPlayers)
|
||||||
{
|
{
|
||||||
final User player = ess.getUser(matchPlayer);
|
final User player = ess.getUser(matchPlayer);
|
||||||
if (player.isHidden())
|
if (skipHidden && player.isHidden())
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,12 +41,13 @@ public class Commandext extends EssentialsCommand
|
||||||
|
|
||||||
private void extinguishPlayers(final Server server, final CommandSender sender, final String name) throws Exception
|
private void extinguishPlayers(final Server server, final CommandSender sender, final String name) throws Exception
|
||||||
{
|
{
|
||||||
|
boolean skipHidden = sender instanceof Player && !ess.getUser(sender).isAuthorized("essentials.vanish.interact");
|
||||||
boolean foundUser = false;
|
boolean foundUser = false;
|
||||||
final List<Player> matchedPlayers = server.matchPlayer(name);
|
final List<Player> matchedPlayers = server.matchPlayer(name);
|
||||||
for (Player matchPlayer : matchedPlayers)
|
for (Player matchPlayer : matchedPlayers)
|
||||||
{
|
{
|
||||||
final User player = ess.getUser(matchPlayer);
|
final User player = ess.getUser(matchPlayer);
|
||||||
if (player.isHidden())
|
if (skipHidden && player.isHidden())
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,12 +32,13 @@ public class Commandfeed extends EssentialsCommand
|
||||||
|
|
||||||
private void feedOtherPlayers(final Server server, final CommandSender sender, final String name) throws NotEnoughArgumentsException
|
private void feedOtherPlayers(final Server server, final CommandSender sender, final String name) throws NotEnoughArgumentsException
|
||||||
{
|
{
|
||||||
|
boolean skipHidden = sender instanceof Player && !ess.getUser(sender).isAuthorized("essentials.vanish.interact");
|
||||||
boolean foundUser = false;
|
boolean foundUser = false;
|
||||||
final List<Player> matchedPlayers = server.matchPlayer(name);
|
final List<Player> matchedPlayers = server.matchPlayer(name);
|
||||||
for (Player matchPlayer : matchedPlayers)
|
for (Player matchPlayer : matchedPlayers)
|
||||||
{
|
{
|
||||||
final User player = ess.getUser(matchPlayer);
|
final User player = ess.getUser(matchPlayer);
|
||||||
if (player.isHidden())
|
if (skipHidden && player.isHidden())
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,12 +63,13 @@ public class Commandfly extends EssentialsCommand
|
||||||
|
|
||||||
private void flyOtherPlayers(final Server server, final CommandSender sender, final String[] args) throws NotEnoughArgumentsException
|
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;
|
boolean foundUser = false;
|
||||||
final List<Player> matchedPlayers = server.matchPlayer(args[0]);
|
final List<Player> matchedPlayers = server.matchPlayer(args[0]);
|
||||||
for (Player matchPlayer : matchedPlayers)
|
for (Player matchPlayer : matchedPlayers)
|
||||||
{
|
{
|
||||||
final User player = ess.getUser(matchPlayer);
|
final User player = ess.getUser(matchPlayer);
|
||||||
if (player.isHidden())
|
if (skipHidden && player.isHidden())
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,12 +85,13 @@ public class Commandgamemode extends EssentialsCommand
|
||||||
throw new NotEnoughArgumentsException("You need to specify a valid player/mode.");
|
throw new NotEnoughArgumentsException("You need to specify a valid player/mode.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean skipHidden = sender instanceof Player && !ess.getUser(sender).isAuthorized("essentials.vanish.interact");
|
||||||
boolean foundUser = false;
|
boolean foundUser = false;
|
||||||
final List<Player> matchedPlayers = server.matchPlayer(name);
|
final List<Player> matchedPlayers = server.matchPlayer(name);
|
||||||
for (Player matchPlayer : matchedPlayers)
|
for (Player matchPlayer : matchedPlayers)
|
||||||
{
|
{
|
||||||
final User player = ess.getUser(matchPlayer);
|
final User player = ess.getUser(matchPlayer);
|
||||||
if (player.isHidden())
|
if (skipHidden && player.isHidden())
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,12 +50,13 @@ public class Commandgod extends EssentialsCommand
|
||||||
|
|
||||||
private void godOtherPlayers(final Server server, final CommandSender sender, final String[] args) throws NotEnoughArgumentsException
|
private void godOtherPlayers(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;
|
boolean foundUser = false;
|
||||||
final List<Player> matchedPlayers = server.matchPlayer(args[0]);
|
final List<Player> matchedPlayers = server.matchPlayer(args[0]);
|
||||||
for (Player matchPlayer : matchedPlayers)
|
for (Player matchPlayer : matchedPlayers)
|
||||||
{
|
{
|
||||||
final User player = ess.getUser(matchPlayer);
|
final User player = ess.getUser(matchPlayer);
|
||||||
if (player.isHidden())
|
if (skipHidden && player.isHidden())
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,13 +50,13 @@ public class Commandheal extends EssentialsCommand
|
||||||
|
|
||||||
private void healOtherPlayers(final Server server, final CommandSender sender, final String name) throws Exception
|
private void healOtherPlayers(final Server server, final CommandSender sender, final String name) throws Exception
|
||||||
{
|
{
|
||||||
|
boolean skipHidden = sender instanceof Player && !ess.getUser(sender).isAuthorized("essentials.vanish.interact");
|
||||||
boolean foundUser = false;
|
boolean foundUser = false;
|
||||||
final List<Player> matchedPlayers = server.matchPlayer(name);
|
final List<Player> matchedPlayers = server.matchPlayer(name);
|
||||||
for (Player matchPlayer : matchedPlayers)
|
for (Player matchPlayer : matchedPlayers)
|
||||||
{
|
{
|
||||||
final User player = ess.getUser(matchPlayer);
|
final User player = ess.getUser(matchPlayer);
|
||||||
if (player.isHidden())
|
if (skipHidden && player.isHidden())
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ public class Commandkick extends EssentialsCommand
|
||||||
if (sender instanceof Player)
|
if (sender instanceof Player)
|
||||||
{
|
{
|
||||||
User user = ess.getUser(sender);
|
User user = ess.getUser(sender);
|
||||||
if (target.isHidden() && !user.isAuthorized("essentials.list.hidden"))
|
if (target.isHidden() && !user.isAuthorized("essentials.vanish.interact"))
|
||||||
{
|
{
|
||||||
throw new PlayerNotFoundException();
|
throw new PlayerNotFoundException();
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ public class Commandmsg extends EssentialsCommand
|
||||||
{
|
{
|
||||||
super("msg");
|
super("msg");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
|
public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
|
||||||
{
|
{
|
||||||
|
@ -25,7 +25,7 @@ public class Commandmsg extends EssentialsCommand
|
||||||
{
|
{
|
||||||
throw new NotEnoughArgumentsException();
|
throw new NotEnoughArgumentsException();
|
||||||
}
|
}
|
||||||
|
|
||||||
String message = getFinalArg(args, 1);
|
String message = getFinalArg(args, 1);
|
||||||
if (sender instanceof Player)
|
if (sender instanceof Player)
|
||||||
{
|
{
|
||||||
|
@ -40,12 +40,12 @@ public class Commandmsg extends EssentialsCommand
|
||||||
{
|
{
|
||||||
message = Util.replaceFormat(message);
|
message = Util.replaceFormat(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
final String translatedMe = _("me");
|
final String translatedMe = _("me");
|
||||||
|
|
||||||
final IReplyTo replyTo = sender instanceof Player ? ess.getUser((Player)sender) : Console.getConsoleReplyTo();
|
final IReplyTo replyTo = sender instanceof Player ? ess.getUser((Player)sender) : Console.getConsoleReplyTo();
|
||||||
final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
|
final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
|
||||||
|
|
||||||
if (args[0].equalsIgnoreCase(Console.NAME))
|
if (args[0].equalsIgnoreCase(Console.NAME))
|
||||||
{
|
{
|
||||||
sender.sendMessage(_("msgFormat", translatedMe, Console.NAME, message));
|
sender.sendMessage(_("msgFormat", translatedMe, Console.NAME, message));
|
||||||
|
@ -55,36 +55,38 @@ public class Commandmsg extends EssentialsCommand
|
||||||
Console.getConsoleReplyTo().setReplyTo(sender);
|
Console.getConsoleReplyTo().setReplyTo(sender);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean skipHidden = sender instanceof Player && !ess.getUser(sender).isAuthorized("essentials.vanish.interact");
|
||||||
boolean foundUser = false;
|
boolean foundUser = false;
|
||||||
final List<Player> matchedPlayers = server.matchPlayer(args[0]);
|
final List<Player> matchedPlayers = server.matchPlayer(args[0]);
|
||||||
|
|
||||||
for (Player matchPlayer : matchedPlayers)
|
for (Player matchPlayer : matchedPlayers)
|
||||||
{
|
{
|
||||||
final User matchedUser = ess.getUser(matchPlayer);
|
final User matchedUser = ess.getUser(matchPlayer);
|
||||||
|
|
||||||
if (sender instanceof Player && matchedUser.isHidden())
|
if (skipHidden && matchedUser.isHidden())
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
foundUser = true;
|
foundUser = true;
|
||||||
if (matchedUser.isAfk())
|
if (matchedUser.isAfk())
|
||||||
{
|
{
|
||||||
sender.sendMessage(_("userAFK", matchPlayer.getDisplayName()));
|
sender.sendMessage(_("userAFK", matchPlayer.getDisplayName()));
|
||||||
}
|
}
|
||||||
|
|
||||||
sender.sendMessage(_("msgFormat", translatedMe, matchPlayer.getDisplayName(), message));
|
sender.sendMessage(_("msgFormat", translatedMe, matchPlayer.getDisplayName(), message));
|
||||||
if (sender instanceof Player && matchedUser.isIgnoredPlayer(ess.getUser(sender)))
|
if (sender instanceof Player && matchedUser.isIgnoredPlayer(ess.getUser(sender)))
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
matchPlayer.sendMessage(_("msgFormat", senderName, translatedMe, message));
|
matchPlayer.sendMessage(_("msgFormat", senderName, translatedMe, message));
|
||||||
replyTo.setReplyTo(matchedUser);
|
replyTo.setReplyTo(matchedUser);
|
||||||
ess.getUser(matchPlayer).setReplyTo(sender);
|
ess.getUser(matchPlayer).setReplyTo(sender);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!foundUser) {
|
if (!foundUser)
|
||||||
|
{
|
||||||
throw new Exception(_("playerNotFound"));
|
throw new Exception(_("playerNotFound"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,12 +31,13 @@ public class Commandpay extends EssentialsCommand
|
||||||
|
|
||||||
double amount = Double.parseDouble(args[1].replaceAll("[^0-9\\.]", ""));
|
double amount = Double.parseDouble(args[1].replaceAll("[^0-9\\.]", ""));
|
||||||
|
|
||||||
|
boolean skipHidden = !user.isAuthorized("essentials.vanish.interact");
|
||||||
boolean foundUser = false;
|
boolean foundUser = false;
|
||||||
final List<Player> matchedPlayers = server.matchPlayer(args[0]);
|
final List<Player> matchedPlayers = server.matchPlayer(args[0]);
|
||||||
for (Player matchPlayer : matchedPlayers)
|
for (Player matchPlayer : matchedPlayers)
|
||||||
{
|
{
|
||||||
User player = ess.getUser(matchPlayer);
|
User player = ess.getUser(matchPlayer);
|
||||||
if (player.isHidden())
|
if (skipHidden && player.isHidden())
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,12 +68,13 @@ public class Commandspeed extends EssentialsCommand
|
||||||
|
|
||||||
private void speedOtherPlayers(final Server server, final CommandSender sender, final boolean isFly, final boolean isBypass, final float speed, final String name) throws NotEnoughArgumentsException
|
private void speedOtherPlayers(final Server server, final CommandSender sender, final boolean isFly, final boolean isBypass, final float speed, final String name) throws NotEnoughArgumentsException
|
||||||
{
|
{
|
||||||
|
boolean skipHidden = sender instanceof Player && !ess.getUser(sender).isAuthorized("essentials.vanish.interact");
|
||||||
boolean foundUser = false;
|
boolean foundUser = false;
|
||||||
final List<Player> matchedPlayers = server.matchPlayer(name);
|
final List<Player> matchedPlayers = server.matchPlayer(name);
|
||||||
for (Player matchPlayer : matchedPlayers)
|
for (Player matchPlayer : matchedPlayers)
|
||||||
{
|
{
|
||||||
final User player = ess.getUser(matchPlayer);
|
final User player = ess.getUser(matchPlayer);
|
||||||
if (player.isHidden())
|
if (skipHidden && player.isHidden())
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,12 +40,13 @@ public class Commandtptoggle extends EssentialsCommand
|
||||||
|
|
||||||
private void toggleOtherPlayers(final Server server, final CommandSender sender, final String[] args) throws NotEnoughArgumentsException
|
private void toggleOtherPlayers(final Server server, final CommandSender sender, final String[] args) throws NotEnoughArgumentsException
|
||||||
{
|
{
|
||||||
|
boolean skipHidden = sender instanceof Player && !ess.getUser(sender).isAuthorized("essentials.teleport.hidden");
|
||||||
boolean foundUser = false;
|
boolean foundUser = false;
|
||||||
final List<Player> matchedPlayers = server.matchPlayer(args[0]);
|
final List<Player> matchedPlayers = server.matchPlayer(args[0]);
|
||||||
for (Player matchPlayer : matchedPlayers)
|
for (Player matchPlayer : matchedPlayers)
|
||||||
{
|
{
|
||||||
final User player = ess.getUser(matchPlayer);
|
final User player = ess.getUser(matchPlayer);
|
||||||
if (player.isHidden())
|
if (skipHidden && player.isHidden())
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue