From c7bdf516dab4e1deba2b2f4503125453430a6671 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 8 Apr 2016 17:24:26 -0500
Subject: [PATCH] Update upstreams and rebuild

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

diff --git a/Spigot-Server-Patches/Timings-v2.patch b/Spigot-Server-Patches/Timings-v2.patch
index e64a6f0956..edf20c9233 100644
--- a/Spigot-Server-Patches/Timings-v2.patch
+++ b/Spigot-Server-Patches/Timings-v2.patch
@@ -348,7 +348,7 @@ diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
+@@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityTeleportEvent;
  import org.bukkit.event.player.PlayerItemConsumeEvent;
  // CraftBukkit end
  
diff --git a/work/Bukkit b/work/Bukkit
index a579a159a0..a70e44d68b 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit a579a159a073406cf1a06d273c6ff8f95b188abe
+Subproject commit a70e44d68bc815051d965cdedc7fc18555f7d73d
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 8d16fc08f1..11e8c6d338 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 8d16fc08f131b9bfacf3140f984fc7dd63ffa8f1
+Subproject commit 11e8c6d3388dc9d6cad52c742be0faebfc6e4511