From 8c0b8acfb6aff606d936b03b356525dfc86fef24 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sun, 6 Dec 2015 17:14:41 -0600
Subject: [PATCH] Restore a constructor that was removed in EntityFallingBlock

---
 ...Add-FallingBlock-source-location-API.patch | 38 +++----------------
 ...s-for-specific-entities-that-fly-thr.patch |  2 +-
 2 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch b/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch
index 6269df5f53..bd70014852 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: Byteflux <byte@byteflux.net>
-Date: Fri, 17 Apr 2015 02:26:14 -0700
+From: Zach Brown <1254957+zachbr@users.noreply.github.com>
+Date: Sun, 6 Dec 2015 17:12:38 -0600
 Subject: [PATCH] Add FallingBlock source location API
 
 
@@ -56,7 +56,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        sourceLoc = loc;
      }
  
--    public EntityFallingBlock(World world, double d0, double d1, double d2, IBlockData iblockdata) {
+     public EntityFallingBlock(World world, double d0, double d1, double d2, IBlockData iblockdata) {
++        this(null, world, d0, d1, d2, iblockdata);
++    }
++
 +    public EntityFallingBlock(org.bukkit.Location loc, World world, double d0, double d1, double d2, IBlockData iblockdata) {
          super(world);
 +        sourceLoc = loc;
@@ -95,35 +98,6 @@ 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
diff --git a/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch b/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch
index 9c683d90ca..d2ec6b62bb 100644
--- a/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch
+++ b/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch
@@ -89,7 +89,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        this.loadChunks = world.paperSpigotConfig.loadUnloadedFallingBlocks; // PaperSpigot
      }
  
-     public EntityFallingBlock(org.bukkit.Location loc, World world, double d0, double d1, double d2, IBlockData iblockdata) {
+     public EntityFallingBlock(World world, double d0, double d1, double d2, IBlockData iblockdata) {
 @@ -0,0 +0,0 @@ public class EntityFallingBlock extends Entity {
          this.lastX = d0;
          this.lastY = d1;