From 99a66a583831628db1c31dd8da30be48e4bdcea3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 3 May 2021 04:42:29 -0400
Subject: [PATCH] [Auto] Updated Upstream (CraftBukkit)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
7ea8b96b4 #826: Make dispenser trigger fertilize event
---
 .../0358-Catch-exceptions-from-dispenser-entity-spawns.patch  | 4 ++--
 ...Fix-last-firework-in-stack-not-having-effects-when-d.patch | 4 ++--
 work/CraftBukkit                                              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/0358-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0358-Catch-exceptions-from-dispenser-entity-spawns.patch
index f724360c49..44ad23e85f 100644
--- a/Spigot-Server-Patches/0358-Catch-exceptions-from-dispenser-entity-spawns.patch
+++ b/Spigot-Server-Patches/0358-Catch-exceptions-from-dispenser-entity-spawns.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Catch exceptions from dispenser entity spawns
 
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java b/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java
-index ffce5baaca6fd5b5e73ed898d12a4fee02c24515..158075319bd49ac78ea994639cdad21aeacdf86f 100644
+index a7d690cb2289a79ee2b8fc665caef58a10ddab3e..50911632341d1b861c00f01077cae43884147fe0 100644
 --- a/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java
 @@ -8,6 +8,7 @@ import net.minecraft.core.BlockPosition;
@@ -16,7 +16,7 @@ index ffce5baaca6fd5b5e73ed898d12a4fee02c24515..158075319bd49ac78ea994639cdad21a
  import net.minecraft.server.level.EntityPlayer;
  import net.minecraft.server.level.WorldServer;
  import net.minecraft.sounds.SoundCategory;
-@@ -236,7 +237,14 @@ public interface IDispenseBehavior {
+@@ -237,7 +238,14 @@ public interface IDispenseBehavior {
                      }
                  }
  
diff --git a/Spigot-Server-Patches/0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index f288956882..9bb8424860 100644
--- a/Spigot-Server-Patches/0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/Spigot-Server-Patches/0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch
@@ -9,10 +9,10 @@ dispensed. The resulting item would have size == 0 and therefore
 be convertered to air, hence why the effects disappeared.
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java b/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java
-index 158075319bd49ac78ea994639cdad21aeacdf86f..93093c05da53e5ddc59fac179081af2e0893706d 100644
+index 50911632341d1b861c00f01077cae43884147fe0..0055a96b51a1d38d31e129c417c97bcfc9d0b745 100644
 --- a/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/IDispenseBehavior.java
-@@ -426,7 +426,7 @@ public interface IDispenseBehavior {
+@@ -427,7 +427,7 @@ public interface IDispenseBehavior {
                  }
  
                  itemstack1 = CraftItemStack.asNMSCopy(event.getItem());
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 95544a2da8..7ea8b96b4a 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 95544a2da8707a3b3ee758e346da9ab063f1dbb2
+Subproject commit 7ea8b96b4a9a168723d1eb109c5abc6fe91b78d6