From 98d1d2ac5700b81c6b35090fd0bb10ea048323d4 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.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/0026-Entity-Origin-API.patch | 12 ++++++------
 work/Bukkit                                        |  2 +-
 work/CraftBukkit                                   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Spigot-Server-Patches/0026-Entity-Origin-API.patch b/Spigot-Server-Patches/0026-Entity-Origin-API.patch
index 2c6cb519e..92cb67406 100644
--- a/Spigot-Server-Patches/0026-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0026-Entity-Origin-API.patch
@@ -1,4 +1,4 @@
-From 664ef5b5c5c1750f856fb081771539e8ae8fb178 Mon Sep 17 00:00:00 2001
+From fc4c38ca6389c3d313fd655ab29817a38ef6ea42 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@@ -123,12 +123,12 @@ index ff7bfdc..5e81076 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
-index 75eed48..65e1408 100644
+index ad4eb39..f6dad02 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
-@@ -57,4 +57,11 @@ public class CraftFallingSand extends CraftEntity implements FallingSand {
-     public void setHurtEntities(boolean hurtEntities) {
-         getHandle().hurtEntities = hurtEntities;
+@@ -65,4 +65,11 @@ public class CraftFallingSand extends CraftEntity implements FallingSand {
+         // Second field for EntityFallingBlock
+         getHandle().ticksLived = value;
      }
 +
 +    // Paper start
@@ -155,5 +155,5 @@ index c493c9c..93843aa 100644
 +    // Paper end
  }
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/work/Bukkit b/work/Bukkit
index 82821325a..268e8e783 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 82821325a6b1645d5607057e9656ef3689f5ae1a
+Subproject commit 268e8e7836982a63dea448c0ef6f4dae020de23a
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 7f1a32252..fb568fdc7 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 7f1a32252b4fc48bad17ab3e1fc0399ce451f15e
+Subproject commit fb568fdc70321e6325a057868bf65d1ebcba1596