Update Upstream

Spigot-Server-Patches/Add-World-Util-Methods.patch

@@ -20,7 +20,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper end
 +
      public Chunk getChunkIfLoaded(int x, int z) {
-         return ((ChunkProviderServer) this.chunkProvider).getLoadedChunkAt(x, z);
+         return ((ChunkProviderServer) this.chunkProvider).getChunkIfLoaded(x, z);
      }
 @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
          }

Spigot-Server-Patches/Do-not-mark-chunks-as-active-for-neighbor-updates.patch

@@ -73,7 +73,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                      continue;
                  }
  
--                net.minecraft.server.Chunk neighbor = world.getChunkProviderServer().getLoadedChunkAt(chunk.locX + x, chunk.locZ + z);
+-                net.minecraft.server.Chunk neighbor = world.getChunkProviderServer().getChunkIfLoaded(chunk.locX + x, chunk.locZ + z);
 +                net.minecraft.server.Chunk neighbor = net.minecraft.server.MCUtil.getLoadedChunkWithoutMarkingActive(world, chunk.locX + x, chunk.locZ + z); // Paper
                  if (neighbor != null) {
                      neighbor.setNeighborUnloaded(-xx, -zz);

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 8982e3f33e4c1d47fe31d71c8dc25e929d7b99d7
+Subproject commit 042911fef46a2efd1fcc4266a01ede48e6e2948c