diff --git a/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch b/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch
index bd70014852..b7ce50c411 100644
--- a/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch
+++ b/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Sun, 6 Dec 2015 17:12:38 -0600
+From: Byteflux <byte@byteflux.net>
+Date: Fri, 17 Apr 2015 02:26:14 -0700
 Subject: [PATCH] Add FallingBlock source location API
 
 
@@ -98,6 +98,35 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      public void a(boolean flag) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -0,0 +0,0 @@ public class CraftWorld implements World {
+         double y = location.getBlockY() + 0.5;
+         double z = location.getBlockZ() + 0.5;
+ 
+-        EntityFallingBlock entity = new EntityFallingBlock(world, x, y, z, net.minecraft.server.Block.getById(material.getId()).fromLegacyData(data));
++        // PaperSpigot start - Add FallingBlock source location API
++        location = location.clone();
++        EntityFallingBlock entity = new EntityFallingBlock(location, world, x, y, z, net.minecraft.server.Block.getById(material.getId()).fromLegacyData(data));
++        // PaperSpigot end
+         entity.ticksLived = 1;
+ 
+         world.addEntity(entity, SpawnReason.CUSTOM);
+@@ -0,0 +0,0 @@ public class CraftWorld implements World {
+             IBlockData blockData = world.getType(new BlockPosition(x, y, z));
+             int type = CraftMagicNumbers.getId(blockData.getBlock());
+             int data = blockData.getBlock().toLegacyData(blockData);
+-
+-            entity = new EntityFallingBlock(world, x + 0.5, y + 0.5, z + 0.5, net.minecraft.server.Block.getById(type).fromLegacyData(data));
++            // PaperSpigot start - Add FallingBlock source location API
++            location = location.clone();
++            entity = new EntityFallingBlock(location, world, x + 0.5, y + 0.5, z + 0.5, net.minecraft.server.Block.getById(type).fromLegacyData(data));
++            // PaperSpigot end
+         } else if (Projectile.class.isAssignableFrom(clazz)) {
+             if (Snowball.class.isAssignableFrom(clazz)) {
+                 entity = new EntitySnowball(world, x, y, z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java