From e4e33753a48a18319078a64cc6b0237a02d3b85f Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Mon, 13 Jun 2022 18:06:25 +0200
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot)

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

Bukkit Changes:
4d37bf30 PR-762: Add SpawnReason and TransformReason for Tadpole metamorphosis into Frog
788174ae PR-761: Add Hangable interface to MangrovePropagule

CraftBukkit Changes:
3571ca8d1 PR-1070: Add SpawnReason and TransformReason for Tadpole metamorphosis into Frog
8f097b92f PR-1068: Add Hangable interface to MangrovePropagule

Spigot Changes:
56be6a84 Rebuild patches
c6c8886d PR-118: Add config option to disable hopper-chunk-loading
---
 patches/server/Optimize-Hoppers.patch | 2 +-
 work/Bukkit                           | 2 +-
 work/CraftBukkit                      | 2 +-
 work/Spigot                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/patches/server/Optimize-Hoppers.patch b/patches/server/Optimize-Hoppers.patch
index 2cf8dde47..f6c586156 100644
--- a/patches/server/Optimize-Hoppers.patch
+++ b/patches/server/Optimize-Hoppers.patch
@@ -422,7 +422,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    private static Container getContainerAt(Level world, double x, double y, double z, boolean optimizeEntities) {
          Object object = null;
          BlockPos blockposition = new BlockPos(x, y, z);
-         if ( !world.hasChunkAt( blockposition ) ) return null; // Spigot
+         if ( !world.spigotConfig.hopperCanLoadChunks && !world.hasChunkAt( blockposition ) ) return null; // Spigot
 @@ -0,0 +0,0 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
              }
          }
diff --git a/work/Bukkit b/work/Bukkit
index c1d911a2b..4d37bf305 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit c1d911a2b4f2aaf85aa6cf9030230fe5940d49da
+Subproject commit 4d37bf305844ec2185646ff265affc5b4a9b2b73
diff --git a/work/CraftBukkit b/work/CraftBukkit
index effea36a2..3571ca8d1 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit effea36a28a3a0796a6ac0cc35609573c404e73c
+Subproject commit 3571ca8d133711c77d9507b771c154d649a37e54
diff --git a/work/Spigot b/work/Spigot
index 1dffefb44..56be6a849 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 1dffefb44e3f2feaffe93434bb2e888817798d42
+Subproject commit 56be6a849145345c489133a676c40ae15b27b8c6