From bd097b4323daaf1e80f60e8c563f3312d2058f31 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
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/0338-Optimize-Hoppers.patch               | 6 +++---
 patches/server/0842-Add-config-for-stronghold-seed.patch | 6 +++---
 work/Bukkit                                              | 2 +-
 work/CraftBukkit                                         | 2 +-
 work/Spigot                                              | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/patches/server/0338-Optimize-Hoppers.patch b/patches/server/0338-Optimize-Hoppers.patch
index 0de2f34d33..6d477d9ca9 100644
--- a/patches/server/0338-Optimize-Hoppers.patch
+++ b/patches/server/0338-Optimize-Hoppers.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] Optimize Hoppers
 * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index feba451e86ef49e5edcc5dc60fae18537a95ee71..3e0e9ae6eb0cdf3e2c53c894cc65277bc4e73b67 100644
+index 40aa6abf0d3a814de194d754d5b136f3ef67d378..4a9addec6c1f08718902da7d3f3628a0900e4c1d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1409,6 +1409,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -78,7 +78,7 @@ index a05acf709735b40ca86f978508c63a86065fd405..6a1405a8630e90db3b5a3c9152259ba6
  
      double getLevelY();
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index d732d00af7870b4b9d7eefe0fc97041b09c12a64..9cb783a3001291ddba44776c6bff0c6369684399 100644
+index a507d7f65a94e49ecd18cd18797b156474558390..a7ac6b528aecae528a17af157f8ec29371e4484c 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -3,7 +3,6 @@ package net.minecraft.world.level.block.entity;
@@ -422,7 +422,7 @@ index d732d00af7870b4b9d7eefe0fc97041b09c12a64..9cb783a3001291ddba44776c6bff0c63
 +    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
 @@ -478,7 +679,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
              }
          }
diff --git a/patches/server/0842-Add-config-for-stronghold-seed.patch b/patches/server/0842-Add-config-for-stronghold-seed.patch
index c8249beb60..9cde0d0a5a 100644
--- a/patches/server/0842-Add-config-for-stronghold-seed.patch
+++ b/patches/server/0842-Add-config-for-stronghold-seed.patch
@@ -23,10 +23,10 @@ index ef53c68c1996e99bc6b6048d5b1bc290cf218158..cdfe2589ca598263d58a11a978e176ab
              int l = 0;
              int i1 = 0;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index b498b027b127996976a394e9a86cfc90f8a8ed3b..31a447e6e156b7b244b2ac69a9c03c09c7ed388c 100644
+index cf96f9fdc4ae561f01d44503b9851c60140e4ea7..bbf15fbb889670e57bd86377590a1b3abe80b96d 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -364,6 +364,7 @@ public class SpigotWorldConfig
+@@ -366,6 +366,7 @@ public class SpigotWorldConfig
      public int mansionSeed;
      public int fossilSeed;
      public int portalSeed;
@@ -34,7 +34,7 @@ index b498b027b127996976a394e9a86cfc90f8a8ed3b..31a447e6e156b7b244b2ac69a9c03c09
      private void initWorldGenSeeds()
      {
          this.villageSeed = this.getInt( "seed-village", 10387312 );
-@@ -381,6 +382,10 @@ public class SpigotWorldConfig
+@@ -383,6 +384,10 @@ public class SpigotWorldConfig
          this.mansionSeed = this.getInt( "seed-mansion", 10387319 );
          this.fossilSeed = this.getInt( "seed-fossil", 14357921 );
          this.portalSeed = this.getInt( "seed-portal", 34222645 );
diff --git a/work/Bukkit b/work/Bukkit
index c1d911a2b4..4d37bf3058 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit c1d911a2b4f2aaf85aa6cf9030230fe5940d49da
+Subproject commit 4d37bf305844ec2185646ff265affc5b4a9b2b73
diff --git a/work/CraftBukkit b/work/CraftBukkit
index effea36a28..3571ca8d13 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit effea36a28a3a0796a6ac0cc35609573c404e73c
+Subproject commit 3571ca8d133711c77d9507b771c154d649a37e54
diff --git a/work/Spigot b/work/Spigot
index 1dffefb44e..56be6a8491 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 1dffefb44e3f2feaffe93434bb2e888817798d42
+Subproject commit 56be6a849145345c489133a676c40ae15b27b8c6