From 43fee1c16e9e427c5393eef6d8a580cd28c2eb42 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 2 Oct 2015 22:58:02 -0500
Subject: [PATCH] Rebuild patches for upstream changes

---
 Spigot-Server-Patches/Add-BeaconEffectEvent.patch           | 2 +-
 Spigot-Server-Patches/Add-PlayerLocaleChangeEvent.patch     | 6 +++---
 Spigot-Server-Patches/Always-tick-falling-blocks.patch      | 4 ++--
 Spigot-Server-Patches/Fast-draining.patch                   | 2 +-
 Spigot-Server-Patches/Metrics.patch                         | 2 +-
 Spigot-Server-Patches/Optimize-Spigot-s-Anti-X-Ray.patch    | 2 +-
 Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch     | 2 +-
 Spigot-Server-Patches/Optimize-explosions.patch             | 2 +-
 .../Remove-invalid-mob-spawner-tile-entities.patch          | 2 +-
 Spigot-Server-Patches/Stackable-Buckets.patch               | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Spigot-Server-Patches/Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/Add-BeaconEffectEvent.patch
index 82056ebf84..eec41d4c4f 100644
--- a/Spigot-Server-Patches/Add-BeaconEffectEvent.patch
+++ b/Spigot-Server-Patches/Add-BeaconEffectEvent.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
-Date: Thu, 23 Jul 2015 12:44:06 -0700
+Date: Thu, 23 Apr 2015 17:26:21 -0400
 Subject: [PATCH] Add BeaconEffectEvent
 
 
diff --git a/Spigot-Server-Patches/Add-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/Add-PlayerLocaleChangeEvent.patch
index 3409ac5cf6..5d87c567b5 100644
--- a/Spigot-Server-Patches/Add-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/Add-PlayerLocaleChangeEvent.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
-Date: Mon, 27 Apr 2015 21:41:39 -0500
+Date: Fri, 27 Mar 2015 00:52:24 -0400
 Subject: [PATCH] Add PlayerLocaleChangeEvent
 
 
@@ -27,8 +27,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -0,0 +0,0 @@ public class CraftEventFactory {
-         entityHuman.world.getServer().getPluginManager().callEvent(event);
-         return (Cancellable) event;
+         firework.world.getServer().getPluginManager().callEvent(event);
+         return event;
      }
 +
 +    // PaperSpigot start - Add PlayerLocaleChangeEvent
diff --git a/Spigot-Server-Patches/Always-tick-falling-blocks.patch b/Spigot-Server-Patches/Always-tick-falling-blocks.patch
index 985c36df69..53f45ed40a 100644
--- a/Spigot-Server-Patches/Always-tick-falling-blocks.patch
+++ b/Spigot-Server-Patches/Always-tick-falling-blocks.patch
@@ -8,8 +8,8 @@ diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -0,0 +0,0 @@ import net.minecraft.server.EntityComplexPart;
- import net.minecraft.server.EntityCreature;
+@@ -0,0 +0,0 @@ import net.minecraft.server.EntityCreature;
+ import net.minecraft.server.EntityCreeper;
  import net.minecraft.server.EntityEnderCrystal;
  import net.minecraft.server.EntityEnderDragon;
 +import net.minecraft.server.EntityFallingBlock;
diff --git a/Spigot-Server-Patches/Fast-draining.patch b/Spigot-Server-Patches/Fast-draining.patch
index df974912f4..f3b8989872 100644
--- a/Spigot-Server-Patches/Fast-draining.patch
+++ b/Spigot-Server-Patches/Fast-draining.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
-Date: Tue, 30 Jun 2015 19:53:03 -0700
+Date: Tue, 30 Jun 2015 19:31:02 -0700
 Subject: [PATCH] Fast draining
 
 
diff --git a/Spigot-Server-Patches/Metrics.patch b/Spigot-Server-Patches/Metrics.patch
index e42b115e9c..49f3272eff 100644
--- a/Spigot-Server-Patches/Metrics.patch
+++ b/Spigot-Server-Patches/Metrics.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Mon, 18 May 2015 18:58:44 -0500
+Date: Wed, 18 Mar 2015 22:55:25 -0600
 Subject: [PATCH] Metrics
 
 
diff --git a/Spigot-Server-Patches/Optimize-Spigot-s-Anti-X-Ray.patch b/Spigot-Server-Patches/Optimize-Spigot-s-Anti-X-Ray.patch
index e6d7d71a10..db4b9300fe 100644
--- a/Spigot-Server-Patches/Optimize-Spigot-s-Anti-X-Ray.patch
+++ b/Spigot-Server-Patches/Optimize-Spigot-s-Anti-X-Ray.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
-Date: Thu, 23 Jul 2015 04:23:23 -0700
+Date: Thu, 23 Apr 2015 17:26:21 -0400
 Subject: [PATCH] Optimize Spigot's Anti X-Ray
 
 
diff --git a/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch
index ae080d1c33..fbb36a0b39 100644
--- a/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch
+++ b/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
-Date: Sun, 8 Mar 2015 01:56:22 -0600
+Date: Sun, 8 Mar 2015 22:55:25 -0600
 Subject: [PATCH] Optimize TileEntity Ticking
 
 
diff --git a/Spigot-Server-Patches/Optimize-explosions.patch b/Spigot-Server-Patches/Optimize-explosions.patch
index a583663228..5906b8569c 100644
--- a/Spigot-Server-Patches/Optimize-explosions.patch
+++ b/Spigot-Server-Patches/Optimize-explosions.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
-Date: Tue, 16 Jun 2015 05:52:58 -0700
+Date: Tue, 16 Jun 2015 00:43:17 -0700
 Subject: [PATCH] Optimize explosions
 
 The process of determining an entity's exposure from explosions can be
diff --git a/Spigot-Server-Patches/Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/Remove-invalid-mob-spawner-tile-entities.patch
index 0cb626088f..1676f3fdfd 100644
--- a/Spigot-Server-Patches/Remove-invalid-mob-spawner-tile-entities.patch
+++ b/Spigot-Server-Patches/Remove-invalid-mob-spawner-tile-entities.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
-Date: Sun, 8 Mar 2015 01:06:14 -0600
+Date: Sun, 8 Mar 2015 22:55:25 -0600
 Subject: [PATCH] Remove invalid mob spawner tile entities
 
 
diff --git a/Spigot-Server-Patches/Stackable-Buckets.patch b/Spigot-Server-Patches/Stackable-Buckets.patch
index f92f01cd06..ccf4c68c6e 100644
--- a/Spigot-Server-Patches/Stackable-Buckets.patch
+++ b/Spigot-Server-Patches/Stackable-Buckets.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
-Date: Mon, 1 Jun 2015 22:21:52 -0700
+Date: Mon, 1 Jun 2015 20:45:24 -0700
 Subject: [PATCH] Stackable Buckets