From 093677dbddb0dcb11fc61a615a345e88a4f37f64 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sat, 18 Apr 2015 15:14:31 -0500
Subject: [PATCH] Fix the repo's patches because I can't merge things today

Thanks to Byteflux for all the PRs you see below bringing 1.8 PaperSpigot that much closer to feature parity with it's 1.7 branch
---
 ...Add-FallingBlock-source-location-API.patch | 20 ++++++++++++++++---
 ...r-crits-helps-mitigate-hacked-client.patch |  4 +---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch b/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch
index 1d19640ff2..ab5056730e 100644
--- a/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch
+++ b/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch
@@ -20,6 +20,22 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              } else {
                  world.setAir(blockposition);
  
+diff --git a/src/main/java/net/minecraft/server/BlockFalling.java b/src/main/java/net/minecraft/server/BlockFalling.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/BlockFalling.java
++++ b/src/main/java/net/minecraft/server/BlockFalling.java
+@@ -0,0 +0,0 @@ public class BlockFalling extends Block {
+ 
+             if (!BlockFalling.instaFall && world.areChunksLoadedBetween(blockposition.a(-b0, -b0, -b0), blockposition.a(b0, b0, b0))) {
+                 if (!world.isClientSide) {
+-                    EntityFallingBlock entityfallingblock = new EntityFallingBlock(world, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, world.getType(blockposition));
++                    // PaperSpigot start - Add FallingBlock source location API
++                    org.bukkit.Location loc = new org.bukkit.Location(world.getWorld(), (double) ((float) blockposition.getX() + 0.5F), (double) blockposition.getY(), (double) ((float) blockposition.getZ() + 0.5F));
++                    EntityFallingBlock entityfallingblock = new EntityFallingBlock(loc, world, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, world.getType(blockposition));
++                    // PaperSpigot end
+ 
+                     this.a(entityfallingblock);
+                     world.addEntity(entityfallingblock);
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -124,6 +140,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // PaperSpigot end
  }
--- 
-1.9.4.msysgit.2
-
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 1f4c180432..fab1b5c241 100644
--- a/Spigot-Server-Patches/Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -33,6 +33,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      public boolean netherVoidTopDamage;
--- 
-1.9.4.msysgit.2
-
+--
\ No newline at end of file