Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-02-03 05:51:22 +01:00
Code Issues Projects Releases Wiki Activity

[Permission] essentials.vanish.interact - Players with this permission will be able to interact with hidden players.

Browse Source
This commit is contained in:
KHobbits 2013-03-20 01:00:50 +00:00
parent 896e14670f
commit 889157371c
12 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Essentials/src/com/earth2me/essentials/commands/Commandexp.java
View File

@ -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;
} }

3
Essentials/src/com/earth2me/essentials/commands/Commandext.java
View File

@ -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;
} }

3
Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
View File

@ -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;
} }

3
Essentials/src/com/earth2me/essentials/commands/Commandfly.java
View File

@ -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;
} }

3
Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java
View File

@ -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;
} }

3
Essentials/src/com/earth2me/essentials/commands/Commandgod.java
View File

@ -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;
} }

4
Essentials/src/com/earth2me/essentials/commands/Commandheal.java
View File

@ -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;
} }

2
Essentials/src/com/earth2me/essentials/commands/Commandkick.java
View File

@ -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();
} }

6
Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
View File

@ -56,6 +56,7 @@ public class Commandmsg extends EssentialsCommand
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]);
@ -63,7 +64,7 @@ public class Commandmsg extends EssentialsCommand
{ {
final User matchedUser = ess.getUser(matchPlayer); final User matchedUser = ess.getUser(matchPlayer);
if (sender instanceof Player && matchedUser.isHidden()) if (skipHidden && matchedUser.isHidden())
{ {
continue; continue;
} }
@ -84,7 +85,8 @@ public class Commandmsg extends EssentialsCommand
ess.getUser(matchPlayer).setReplyTo(sender); ess.getUser(matchPlayer).setReplyTo(sender);
} }
if (!foundUser) { if (!foundUser)
{
throw new Exception(_("playerNotFound")); throw new Exception(_("playerNotFound"));
} }
} }

3
Essentials/src/com/earth2me/essentials/commands/Commandpay.java
View File

@ -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;
} }

3
Essentials/src/com/earth2me/essentials/commands/Commandspeed.java
View File

@ -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;
} }

3
Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java
View File

@ -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;
} }