From 2190d87f45d6b94a7be84e179344ed235865a1f3 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Fri, 18 Sep 2015 20:44:37 -0500 Subject: [PATCH] Rebuild patches --- .../Add-FallingBlock-source-location-API.patch | 8 +++----- .../Add-FallingBlock-source-location-API.patch | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Spigot-API-Patches/Add-FallingBlock-source-location-API.patch b/Spigot-API-Patches/Add-FallingBlock-source-location-API.patch index 681e40bcd1..82dde57377 100644 --- a/Spigot-API-Patches/Add-FallingBlock-source-location-API.patch +++ b/Spigot-API-Patches/Add-FallingBlock-source-location-API.patch @@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/entity/FallingBlock.java +++ b/src/main/java/org/bukkit/entity/FallingBlock.java @@ -0,0 +0,0 @@ public interface FallingBlock extends Entity { - * @param drop true to break into an item when obstructed + * @param hurtEntities whether entities will be damaged by this block. */ - void setDropItem(boolean drop); + void setHurtEntities(boolean hurtEntities); + + /** + * Gets the source block location of the falling block @@ -20,6 +20,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + */ + org.bukkit.Location getSourceLoc(); // PaperSpigot - Add FallingBlock source location API } --- -1.9.4.msysgit.2 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch b/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch index ab5056730e..6269df5f53 100644 --- a/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch +++ b/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch @@ -129,8 +129,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 setDropItem(boolean drop) { - getHandle().dropItem = drop; + public void setHurtEntities(boolean hurtEntities) { + getHandle().hurtEntities = hurtEntities; } + + // PaperSpigot start - Add FallingBlock source location API