Update upstream B/CB

2016-12-16 15:00:16 -06:00 · 2016-12-16 15:00:16 -06:00 · dbfd2a3406
Commit dbfd2a3406
--- 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
@ -1 +1 @@
-Subproject commit 1603bcf467683f1303dc6f2d5f95908deec1b74d
+Subproject commit 703a1cf8353492f83c8b2c1bfd61bc618254c085
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit 4f479728ee68a15a6d2df78fce8cf9e514e43b65
+Subproject commit 0a6a5cb4ad97482e62f612b56199fb85bffc2171