Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
6446e54 Readd "Use getChunkIfLoadedImmediately in places" (#6047)
0ae6dd2 fix custom beacon ranges (#6067)

gradle.properties

@@ -4,7 +4,7 @@ version = 1.17-R0.1-SNAPSHOT
 mcVersion = 1.17
 packageVersion = 1_17_R1
 
-paperCommit = 882039d03e0767a1a83eda67b08c6047c2f27904
+paperCommit = 0ae6dd265913fc1e0c602d7d9dfa82494c5f5d3c
 
 org.gradle.parallel = true
 org.gradle.vfs.watch = false

patches/server/0001-Tuinity-Server-Changes.patch

@@ -12178,7 +12178,7 @@ index 44aa0c4ec6f0e4df2541c74fa7de852dae59bda5..a00627e0fa38632449042f59c053b4da
                              if (flag2) {
                                  packet1 = new ClientboundMoveEntityPacket.Pos(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), this.entity.isOnGround());
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 87b3eee23441717660aa6bb81248986cb7ef2fb4..a4546a80b0d1fde8c4f92fea575745b1352d95b0 100644
+index 8154ca39ec7e2e8559cd125d73a59b8d2b00714c..07b0eae123e310809dc28506ebe2e0878dcaa224 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -115,6 +115,7 @@ import net.minecraft.world.level.block.EntityBlock;
@@ -13173,7 +13173,7 @@ index 0f6b534a4c789a2f09f6c4624e5d58b99c7ed0e6..fea852674098fe411841d8e5ebeace7d
          this.generatingStatus = chunkstatus;
          this.writeRadiusCutoff = i;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8708eb173fbb17cf84a0c6d9a42623750472f650..9dc5c82ea1d497174d288000f9f1ccaabbcb4a18 100644
+index 35fa416a8ce332e823ed5077a8fd3492683d7ad0..f78119970da27ef66a9d9093e2e42ce129d4cf31 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -537,6 +537,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -14178,7 +14178,7 @@ index 325e244c46ec208a2e7e18d71ccbbfcc25fc1bce..6a4e44dd8935018d1b5283761dfb8e85
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 1c171599dbde44389013dc08ca8263742d58d721..862553e98a7237d39a26036c615b9cbd001bd3bf 100644
+index 17281575ff83bbf1e720335619a78a6d0a0e5077..8196be52af4a5ea1bf280d646dc2db15d9ad6ea2 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -166,6 +166,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -14190,7 +14190,7 @@ index 1c171599dbde44389013dc08ca8263742d58d721..862553e98a7237d39a26036c615b9cbd
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -195,9 +197,117 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -202,9 +204,117 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return this.typeKey;
      }
  
@@ -14308,7 +14308,7 @@ index 1c171599dbde44389013dc08ca8263742d58d721..862553e98a7237d39a26036c615b9cbd
          this.generator = gen;
          this.world = new CraftWorld((ServerLevel) this, gen, env);
          this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
-@@ -271,6 +381,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -278,6 +388,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          this.chunkPacketBlockController = this.paperConfig.antiXray ?
              new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor)
              : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
@@ -14316,7 +14316,7 @@ index 1c171599dbde44389013dc08ca8263742d58d721..862553e98a7237d39a26036c615b9cbd
      }
  
      // Paper start
-@@ -356,6 +467,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -363,6 +474,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Override
      public final LevelChunk getChunk(int chunkX, int chunkZ) { // Paper - final to help inline
@@ -14332,7 +14332,7 @@ index 1c171599dbde44389013dc08ca8263742d58d721..862553e98a7237d39a26036c615b9cbd
          return (LevelChunk) this.getChunk(chunkX, chunkZ, ChunkStatus.FULL, true); // Paper - avoid a method jump
      }
  
-@@ -544,7 +664,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -551,7 +671,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  this.sendBlockUpdated(blockposition, iblockdata1, iblockdata, i);
                  // Paper start - per player view distance - allow block updates for non-ticking chunks in player view distance
                  // if copied from above
@@ -14341,7 +14341,7 @@ index 1c171599dbde44389013dc08ca8263742d58d721..862553e98a7237d39a26036c615b9cbd
                  ((ServerLevel)this).getChunkSource().blockChanged(blockposition);
                  // Paper end - per player view distance
              }
-@@ -855,6 +975,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -862,6 +982,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public <T extends Entity> void guardEntityTick(Consumer<T> tickConsumer, T entity) {
          try {
              tickConsumer.accept(entity);
@@ -14349,7 +14349,7 @@ index 1c171599dbde44389013dc08ca8263742d58d721..862553e98a7237d39a26036c615b9cbd
          } catch (Throwable throwable) {
              if (throwable instanceof ThreadDeath) throw throwable; // Paper
              // Paper start - Prevent tile entity and entity crashes
-@@ -984,26 +1105,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -991,26 +1112,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
          this.getProfiler().incrementCounter("getEntities");
          List<Entity> list = Lists.newArrayList();
@@ -14377,7 +14377,7 @@ index 1c171599dbde44389013dc08ca8263742d58d721..862553e98a7237d39a26036c615b9cbd
          return list;
      }
  
-@@ -1012,26 +1114,22 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1019,26 +1121,22 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          this.getProfiler().incrementCounter("getEntities");
          List<T> list = Lists.newArrayList();
  
@@ -14419,7 +14419,7 @@ index 1c171599dbde44389013dc08ca8263742d58d721..862553e98a7237d39a26036c615b9cbd
          return list;
      }
  
-@@ -1319,10 +1417,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1326,10 +1424,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public abstract TagContainer getTagManager();
  
      public BlockPos getBlockRandomPos(int x, int y, int z, int l) {
@@ -17119,7 +17119,7 @@ index 3403b75c8311f1e52a0533363c5f0307442f8a15..92cb1fd2419eb3a3e64ebc0c5e699a79
      // Spigot start
      private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 32f82c60b680180b256edff127e5a6ded42fccf4..332c33c95cc450d76f512e58dd6d4b61ea2de431 100644
+index c3c7b34ceb1b8f0ed042b29924c633fa7519dc30..c59deadcfbfd5afbf951a167979a4eceb0c63579 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -146,6 +146,13 @@ public class Main {
@@ -17205,7 +17205,7 @@ index 8246ad7ebecdfc0b7519fe4412fef7b07407e850..c0a508295d2e68d92ec8d24e14f9b762
      @Override
      public boolean teleport(Location location) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 76e2ae09855e0efaaa0856d2f49e4968adbccbdc..fc8a8ccd4273ec5d44b216d96034ac048a2ac38e 100644
+index 4e95bf2eb6434d8ca44d478262329c56b0b0a079..1da5b6f73e78a697031f7662e68c546543fb9d1a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -516,15 +516,70 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0003-Purpur-config-files.patch

@@ -100,7 +100,7 @@ index 0ed5e15d3175ee5d145730ff8f506ffb959e5e6c..6e67ea018cd6f362bba104f542c52438
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.getClass(); // load mappings for stacktrace deobf
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 862553e98a7237d39a26036c615b9cbd001bd3bf..d11b463548b847382a22fdf50496b186caa0c526 100644
+index 8196be52af4a5ea1bf280d646dc2db15d9ad6ea2..beb845128b0ef8eef254afa7141af280f391ade6 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -168,6 +168,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -112,7 +112,7 @@ index 862553e98a7237d39a26036c615b9cbd001bd3bf..d11b463548b847382a22fdf50496b186
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -308,6 +310,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -315,6 +317,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), this.spigotConfig); // Paper
          this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData)worlddatamutable).getLevelName()); // Tuinity - Server Config

patches/server/0082-Add-allow-water-in-end-world-option.patch

@@ -27,10 +27,10 @@ index 4fdb99240e6ebda946fd2e0a847654d92b7c56a1..e6dbe6e2d65aa4432f469910fd060649
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d11b463548b847382a22fdf50496b186caa0c526..65aba9a17a76e56c0140220ab00645a1e02cc8b5 100644
+index beb845128b0ef8eef254afa7141af280f391ade6..8a9d103a579bc2a1874b99b3f8543d875cd9119f 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1486,4 +1486,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1493,4 +1493,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          }
  
      }

patches/server/0119-Add-adjustable-breeding-cooldown-to-config.patch

@@ -33,7 +33,7 @@ index 5a503a255b4e7e684a8f42d8190430397ca81683..7a90c6a628571730eee382e1efcfe1b9
              entityageable.setBaby(true);
              entityageable.moveTo(this.getX(), this.getY(), this.getZ(), 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 65aba9a17a76e56c0140220ab00645a1e02cc8b5..bfac7888f71232ac095e2615bddf05d71384f359 100644
+index 8a9d103a579bc2a1874b99b3f8543d875cd9119f..e2ce992486308f0edff1477d78a1bef3fa3e3346 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -187,6 +187,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -86,7 +86,7 @@ index 65aba9a17a76e56c0140220ab00645a1e02cc8b5..bfac7888f71232ac095e2615bddf05d7
      public CraftWorld getWorld() {
          return this.world;
      }
-@@ -311,6 +354,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -318,6 +361,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), this.spigotConfig); // Paper
          this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData)worlddatamutable).getLevelName()); // Tuinity - Server Config
          this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((ServerLevel) this, ((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur