Update upstream B/CB

2016-12-16 15:00:16 -06:00
parent 659a7c955f
commit dbfd2a3406
3 changed files with 2 additions and 11 deletions
--- a/Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch
@@ -497,13 +497,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
     // Paper end
 
     /**
-@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
-      * Resets the title displayed to the player.
-      * @deprecated API subject to change.
-      */
-    @Deprecated
-+    // Paper - undeprecate
-     public void resetTitle();
- 
- 
 --
--- a/work/Bukkit
+++ b/work/Bukkit
--- a/work/CraftBukkit
+++ b/work/CraftBukkit