diff options
Diffstat (limited to 'src')
4 files changed, 40 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/command/defaults/ListCommand.java b/src/main/java/org/bukkit/command/defaults/ListCommand.java index b7fc3b0a..67f58fa4 100644 --- a/src/main/java/org/bukkit/command/defaults/ListCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ListCommand.java @@ -19,6 +19,10 @@ public class ListCommand extends VanillaCommand { StringBuilder players = new StringBuilder(); for (Player player : Bukkit.getOnlinePlayers()) { + // If a player is hidden from the sender don't show them in the list + if (sender instanceof Player && !((Player) sender).canSee(player)) + continue; + if (players.length() > 0) { players.append(", "); } diff --git a/src/main/java/org/bukkit/command/defaults/TellCommand.java b/src/main/java/org/bukkit/command/defaults/TellCommand.java index 4fce3b1c..4cc31bc8 100644 --- a/src/main/java/org/bukkit/command/defaults/TellCommand.java +++ b/src/main/java/org/bukkit/command/defaults/TellCommand.java @@ -24,7 +24,8 @@ public class TellCommand extends VanillaCommand { Player player = Bukkit.getPlayerExact(args[0]); - if (player == null) { + // If a player is hidden from the sender pretend they are offline + if (player == null || (sender instanceof Player && !((Player) sender).canSee(player))) { sender.sendMessage("There's no player by that name online."); } else { StringBuilder message = new StringBuilder(); diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java index 21e8204a..1ee3722e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -490,4 +490,26 @@ public interface Player extends HumanEntity, CommandSender, OfflinePlayer, Plugi */ public void setAllowFlight(boolean flight); + /** + * Hides a player from this player + * + * @param player Player to hide + */ + public void hidePlayer(Player player); + + /** + * Allows this player to see a player that was previously hidden + * + * @param player Player to show + */ + public void showPlayer(Player player); + + /** + * Checks to see if a player has been hidden from this player + * + * @param player Player to check + * @return True if the provided player is not being hidden from this player + */ + public boolean canSee(Player player); + } diff --git a/src/test/java/org/bukkit/plugin/messaging/TestPlayer.java b/src/test/java/org/bukkit/plugin/messaging/TestPlayer.java index 4bef1f02..95e02c76 100644 --- a/src/test/java/org/bukkit/plugin/messaging/TestPlayer.java +++ b/src/test/java/org/bukkit/plugin/messaging/TestPlayer.java @@ -609,4 +609,16 @@ public class TestPlayer implements Player { public void setBedSpawnLocation(Location location) { throw new UnsupportedOperationException("Not supported yet."); } + + public void hidePlayer(Player player) { + throw new UnsupportedOperationException("Not supported yet."); + } + + public void showPlayer(Player player) { + throw new UnsupportedOperationException("Not supported yet."); + } + + public boolean canSee(Player player) { + throw new UnsupportedOperationException("Not supported yet."); + } } |