From 7f67ce93a3e31eec66a68d3d49e79c881ab63d5a Mon Sep 17 00:00:00 2001
From: Bukkit/Spigot <noreply+git-bukkit@papermc.io>
Date: Thu, 23 Nov 2017 17:09:29 -0800
Subject: [PATCH] SPIGOT-3663: Add plugin parameter to hidePlayer+showPlayer.

By: Chris Cowan <agentme49@gmail.com>
---
 .../main/java/org/bukkit/entity/Player.java   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/paper-api/src/main/java/org/bukkit/entity/Player.java b/paper-api/src/main/java/org/bukkit/entity/Player.java
index 33f6e6dc39..082302d125 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Player.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Player.java
@@ -22,6 +22,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.conversations.Conversable;
 import org.bukkit.event.player.PlayerResourcePackStatusEvent;
 import org.bukkit.map.MapView;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.messaging.PluginMessageRecipient;
 import org.bukkit.scoreboard.Scoreboard;
 
@@ -910,16 +911,38 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      * Hides a player from this player
      *
      * @param player Player to hide
+     * @deprecated see {@link #hidePlayer(Plugin, Player)}
      */
+    @Deprecated
     public void hidePlayer(Player player);
 
+    /**
+     * Hides a player from this player
+     *
+     * @param plugin Plugin that wants to hide the player
+     * @param player Player to hide
+     */
+    public void hidePlayer(Plugin plugin, Player player);
+
     /**
      * Allows this player to see a player that was previously hidden
      *
      * @param player Player to show
+     * @deprecated see {@link #showPlayer(Plugin, Player)}
      */
+    @Deprecated
     public void showPlayer(Player player);
 
+    /**
+     * Allows this player to see a player that was previously hidden. If
+     * another another plugin had hidden the player too, then the player will
+     * remain hidden until the other plugin calls this method too.
+     *
+     * @param plugin Plugin that wants to show the player
+     * @param player Player to show
+     */
+    public void showPlayer(Plugin plugin, Player player);
+
     /**
      * Checks to see if a player has been hidden from this player
      *