From 4076ee569becaae5b99d6a35ca7ba3119a6d7588 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 4 Mar 2016 15:59:51 -0600
Subject: [PATCH] Update against latest

---
 Bukkit                                                      | 2 +-
 .../0060-Ensure-commands-are-not-ran-async.patch            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Bukkit b/Bukkit
index 7d83cba0f..c44c41ef0 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 7d83cba0f2575112577ed7a091ed8a193bfc261a
+Subproject commit c44c41ef02307f87bd978a6021a10d9b3d751d5e
diff --git a/Spigot-Server-Patches/0060-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0060-Ensure-commands-are-not-ran-async.patch
index c937512a8..93a2b8bd3 100644
--- a/Spigot-Server-Patches/0060-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0060-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From 44fe67033cd744250a99062291bb96543dffbaca Mon Sep 17 00:00:00 2001
+From 116d2d92f3664866cc5828523fd616bff930fc2e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4badf18..d62d033 100644
+index 25d9d85..3a4bcf9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1228,6 +1228,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1229,6 +1229,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          if (!async && s.startsWith("/")) {