From 03eeadc2df137ea12a3a8e3a9c3dd01cd367e653 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Mon, 13 Jun 2016 18:42:08 -0500
Subject: [PATCH] Update upstream B/CB

Merges fixes for SPIGOT-2404 and SPIGOT-2408 into Paper
---
 Spigot-Server-Patches/Entity-Origin-API.patch | 4 ++--
 work/Bukkit                                   | 2 +-
 work/CraftBukkit                              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Spigot-Server-Patches/Entity-Origin-API.patch b/Spigot-Server-Patches/Entity-Origin-API.patch
index 22980b6fa6..bd16c2015e 100644
--- a/Spigot-Server-Patches/Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/Entity-Origin-API.patch
@@ -127,8 +127,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
 @@ -0,0 +0,0 @@ public class CraftFallingSand extends CraftEntity implements FallingSand {
-     public void setHurtEntities(boolean hurtEntities) {
-         getHandle().hurtEntities = hurtEntities;
+         // Second field for EntityFallingBlock
+         getHandle().ticksLived = value;
      }
 +
 +    // Paper start
diff --git a/work/Bukkit b/work/Bukkit
index 82821325a6..268e8e7836 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 82821325a6b1645d5607057e9656ef3689f5ae1a
+Subproject commit 268e8e7836982a63dea448c0ef6f4dae020de23a
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 7f1a32252b..fb568fdc70 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 7f1a32252b4fc48bad17ab3e1fc0399ce451f15e
+Subproject commit fb568fdc70321e6325a057868bf65d1ebcba1596