From dbfd2a3406d16ca214e8dd322ca29cce233d02d5 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 16 Dec 2016 15:00:16 -0600
Subject: [PATCH] Update upstream B/CB

---
 Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch | 9 ---------
 work/Bukkit                                             | 2 +-
 work/CraftBukkit                                        | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch
index b3eb81ef8..087aa12ba 100644
--- 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();
- 
- 
 --
\ No newline at end of file
diff --git a/work/Bukkit b/work/Bukkit
index 1603bcf46..703a1cf83 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 1603bcf467683f1303dc6f2d5f95908deec1b74d
+Subproject commit 703a1cf8353492f83c8b2c1bfd61bc618254c085
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 4f479728e..0a6a5cb4a 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 4f479728ee68a15a6d2df78fce8cf9e514e43b65
+Subproject commit 0a6a5cb4ad97482e62f612b56199fb85bffc2171