From f54aa3ca2cccb76127511f4d13ce3b8a0e4acd7a Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Mon, 11 Apr 2016 10:30:12 -0500
Subject: [PATCH] Update upstreams

---
 Spigot-API-Patches/Timings-v2.patch | 2 +-
 work/CraftBukkit                    | 2 +-
 work/Spigot                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Spigot-API-Patches/Timings-v2.patch b/Spigot-API-Patches/Timings-v2.patch
index 39400a938a4..e7f81f1e919 100644
--- a/Spigot-API-Patches/Timings-v2.patch
+++ b/Spigot-API-Patches/Timings-v2.patch
@@ -3207,7 +3207,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
-         public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
+         public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
 +
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 420b983d59a..a28f87a55c1 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 420b983d59aecc1739b11916f60756933302f577
+Subproject commit a28f87a55c1eef87d4f9b88dafc0996d00d6b20a
diff --git a/work/Spigot b/work/Spigot
index 944aa2003b1..5a403651d2b 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 944aa2003b1a56b732e8cf6062f189aaef45a058
+Subproject commit 5a403651d2b6da681d7aba14e3b1df8171fc5249