Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

Bukkit-Patches/0023-Add-support-for-fetching-hidden-players.patch

@@ -1,14 +1,14 @@
-From 4a752151018a3b7fe29c65482b3dff42776c0155 Mon Sep 17 00:00:00 2001
+From 267dd31ea425a46cc9c6169944a397dc285f5270 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:02:11 -0500
 Subject: [PATCH] Add support for fetching hidden players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 204c4b2..6237663 100644
+index 2cc19a7..37c8a58 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1077,6 +1077,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1094,6 +1094,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
@@ -26,5 +26,5 @@ index 204c4b2..6237663 100644
  
      Spigot spigot();
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0