Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-04-03 21:12:44 +01:00
parent b07d19630a
commit fbf54955d5
25 changed files with 100 additions and 98 deletions

View File

@@ -1,14 +1,14 @@
From be6adae398e836ab8b44a443eb0f9310d572f1bc Mon Sep 17 00:00:00 2001
From 2a49f5d8789b6509a1458ccd1550a7e3fddd4f73 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 11599fc..b6eac78 100644
index 9c55316..024cf9c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1342,6 +1342,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1364,6 +1364,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
return getHandle().locale;
}
@@ -22,5 +22,5 @@ index 11599fc..b6eac78 100644
public Player.Spigot spigot()
--
1.8.3.2
1.8.5.2.msysgit.0