Upstream merge

By: md_5 <git@md-5.net>
2014-04-24 16:27:12 +10:00
parent a8030addd9
commit b56d35552d
78 changed files with 483 additions and 218 deletions
--- a/CraftBukkit-Patches/0099-Add-support-for-fetching-hidden-players.patch
+++ b/CraftBukkit-Patches/0099-Add-support-for-fetching-hidden-players.patch
@@ -0,0 +1,32 @@
+From 4313d8729d3b334841c344ff81bda7c3d8674081 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 a447add..3c4b42f 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -1374,6 +1374,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         {
+            return getHandle().locale;
+         }
+
+        @Override
+        public Set<Player> getHiddenPlayers()
+        {
+            Set<Player> ret = new HashSet<Player>();
+            for ( UUID u : hiddenPlayers )
+            {
+                ret.add( getServer().getPlayer( u ) );
+            }
+
+            return java.util.Collections.unmodifiableSet( ret );
+        }
+     };
+ 
+     public Player.Spigot spigot()
+-- 
+1.9.1
+