Merge some stuff from upstream.

By: md_5 <git@md-5.net>

CraftBukkit-Patches/0105-Add-support-for-fetching-hidden-players.patch

@@ -1,14 +1,14 @@
-From 9b9f64c29e0f3ccb457b478c1b7c987022b6651d Mon Sep 17 00:00:00 2001
+From be6adae398e836ab8b44a443eb0f9310d572f1bc Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:03:03 -0500
 Subject: [PATCH] Add support for fetching hidden players
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 23d9612..f687308 100644
+index 11599fc..b6eac78 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1341,6 +1341,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1342,6 +1342,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          {
             return getHandle().locale;
          }
@@ -22,5 +22,5 @@ index 23d9612..f687308 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2