diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch
index 44a51906f..62c94dc84 100644
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 0ec92e17d7012a63b718d6c7d816d45b4fd2a4f4 Mon Sep 17 00:00:00 2001
+From c6ee4d00002d40f7052f63322b805dfd5aaeaaf7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -3203,11 +3203,11 @@ index fc59aa3..0000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8e38006..19f7ae7 100644
+index 2a51646..90248d8 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1360,6 +1360,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
-         public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
+@@ -1380,6 +1380,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+         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/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch
index 276620c4e..5be9ffbda 100644
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 4fba15a4a8ff469ce922547d70461c08448ca608 Mon Sep 17 00:00:00 2001
+From 9580aa6af9b38fb50192c06791f859b4a1a12759 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -948,7 +948,7 @@ index 41d2d87..0000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 70580f7..dfa5962 100644
+index 0756c81..888823c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -968,7 +968,7 @@ index 70580f7..dfa5962 100644
  import org.bukkit.craftbukkit.map.CraftMapView;
  import org.bukkit.craftbukkit.map.RenderData;
  import org.bukkit.craftbukkit.scoreboard.CraftScoreboard;
-@@ -1528,6 +1522,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1542,6 +1536,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 420b983d5..a28f87a55 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 420b983d59aecc1739b11916f60756933302f577
+Subproject commit a28f87a55c1eef87d4f9b88dafc0996d00d6b20a
diff --git a/work/Spigot b/work/Spigot
index 944aa2003..5a403651d 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 944aa2003b1a56b732e8cf6062f189aaef45a058
+Subproject commit 5a403651d2b6da681d7aba14e3b1df8171fc5249