Update to 1.21.10-rc1

Author: jpenilla

gradle.properties

@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.21.9-R0.1-SNAPSHOT
-mcVersion=1.21.9
+version=1.21.10-rc1-R0.1-SNAPSHOT
+mcVersion=1.21.10-rc1
 
 # Set to true while updating Minecraft version
 updatingMinecraft=true

paper-server/build.gradle.kts

@@ -17,7 +17,7 @@ plugins {
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
 
 dependencies {
-    mache("io.papermc:mache:1.21.9+build.1")
+    mache("io.papermc:mache:1.21.10-rc1+build.5")
     paperclip("io.papermc:paperclip:3.0.3")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

@@ -23005,7 +23005,7 @@ index e7510be12644b2edd966c538c84379a3d5fe89b5..8d299a75c80fddc61a2aa4dc5b0dc594
                  thread1 -> {
                      DedicatedServer dedicatedServer1 = new DedicatedServer(
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 843229c35e5c198f335d47d520e6391c4569237f..a38d52b5b3c16b054332d38c44dfe28f91206284 100644
+index 1ad7b0bd0041642530fcf1c1a7e4aba8e63c1441..719d92f45b4bf2ffed01490388c75bc43d417c00 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -177,7 +177,7 @@ import net.minecraft.world.phys.Vec2;
@@ -23175,9 +23175,9 @@ index 843229c35e5c198f335d47d520e6391c4569237f..a38d52b5b3c16b054332d38c44dfe28f
          // Paper start - Improved watchdog support - move final shutdown items here
          Util.shutdownExecutors();
          try {
-@@ -1102,6 +1182,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                     profilerFiller.push("tick");
-                     this.tickFrame.start();
+@@ -1105,6 +1185,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                     this.packetProcessor.processQueuedPackets();
+                     profilerFiller.pop();
                      this.tickServer(flag ? () -> false : this::haveTime);
 +                    // Paper start - rewrite chunk system
 +                    final Throwable crash = this.chunkSystemCrash;
@@ -23189,15 +23189,15 @@ index 843229c35e5c198f335d47d520e6391c4569237f..a38d52b5b3c16b054332d38c44dfe28f
                      this.tickFrame.end();
                      profilerFiller.popPush("nextTickWait");
                      this.mayHaveDelayedTasks = true;
-@@ -1276,6 +1363,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1279,6 +1366,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      private boolean pollTaskInternal() {
          if (super.pollTask()) {
 +            this.moonrise$executeMidTickTasks(); // Paper - rewrite chunk system
              return true;
          } else {
              boolean ret = false; // Paper - force execution of all worlds, do not just bias the first
-@@ -2457,6 +2545,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2460,6 +2548,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
 
@@ -26910,7 +26910,7 @@ index 9f88fafefa490be098b6d45cb55ae290fb435246..f79dfe4d6431de334d890759bbb84d44
      }
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index b40fd308a93295f52392cf8d05673a8455667f85..be318510a571de3064b3b13187456049bbb52cdf 100644
+index a124ee91940c5e323546eb7ba22f73643330e88f..9967b8b90a20461ea5fb77250d5a6680ff2cf582 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -201,7 +201,7 @@ import net.minecraft.world.scores.Team;
@@ -27990,7 +27990,7 @@ index 8cc5c0716392ba06501542ff5cbe71ee43979e5d..09fd99c9cbd23b5f3c899bfb00c9b896
 +    // Paper end - block counting
  }
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 5ee3dc10cb4755fca83d8f7cad55d26b07afd6ff..346d9dfafab6dfe6f8253552d0e89ecd7e190312 100644
+index 6aab64ed605376324898db1bc0d991e951810dad..b46b976f74a9950f9ffc557a4bd7effe712d764b 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -149,7 +149,7 @@ import net.minecraft.world.waypoints.WaypointTransmitter;
@@ -28241,7 +28241,7 @@ index 5ee3dc10cb4755fca83d8f7cad55d26b07afd6ff..346d9dfafab6dfe6f8253552d0e89ecd
 
      public Entity(EntityType<?> entityType, Level level) {
          this.type = entityType;
-@@ -1368,35 +1474,77 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -1371,35 +1477,77 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
          return list.isEmpty() ? distance : -Shapes.collide(Direction.Axis.Y, boundingBox, list, -distance);
      }
 
@@ -28343,7 +28343,7 @@ index 5ee3dc10cb4755fca83d8f7cad55d26b07afd6ff..346d9dfafab6dfe6f8253552d0e89ecd
      }
 
      private static float[] collectCandidateStepUpHeights(AABB box, List<VoxelShape> colliders, float deltaY, float maxUpStep) {
-@@ -2700,21 +2848,110 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -2705,21 +2853,110 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      }
 
      public boolean isInWall() {
@@ -28465,7 +28465,7 @@ index 5ee3dc10cb4755fca83d8f7cad55d26b07afd6ff..346d9dfafab6dfe6f8253552d0e89ecd
      }
 
      public InteractionResult interact(Player player, InteractionHand hand) {
-@@ -4327,15 +4564,17 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4332,15 +4569,17 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      }
 
      public Iterable<Entity> getIndirectPassengers() {
@@ -28491,7 +28491,7 @@ index 5ee3dc10cb4755fca83d8f7cad55d26b07afd6ff..346d9dfafab6dfe6f8253552d0e89ecd
      }
 
      public int countPlayerPassengers() {
-@@ -4478,77 +4717,136 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4483,77 +4722,136 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
          return Mth.lerp(partialTick, this.yRotO, this.yRot);
      }
 
@@ -28682,7 +28682,7 @@ index 5ee3dc10cb4755fca83d8f7cad55d26b07afd6ff..346d9dfafab6dfe6f8253552d0e89ecd
 
      public boolean touchingUnloadedChunk() {
          AABB aabb = this.getBoundingBox().inflate(1.0);
-@@ -4704,6 +5002,15 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4709,6 +5007,15 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      }
 
      public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {
@@ -28698,7 +28698,7 @@ index 5ee3dc10cb4755fca83d8f7cad55d26b07afd6ff..346d9dfafab6dfe6f8253552d0e89ecd
          if (!checkPosition(this, x, y, z)) {
              return;
          }
-@@ -4855,6 +5162,12 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4860,6 +5167,12 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
 
      @Override
      public final void setRemoved(Entity.RemovalReason removalReason, @Nullable org.bukkit.event.entity.EntityRemoveEvent.Cause cause) { // CraftBukkit - add Bukkit remove cause
@@ -28711,7 +28711,7 @@ index 5ee3dc10cb4755fca83d8f7cad55d26b07afd6ff..346d9dfafab6dfe6f8253552d0e89ecd
          org.bukkit.craftbukkit.event.CraftEventFactory.callEntityRemoveEvent(this, cause); // CraftBukkit
          final boolean alreadyRemoved = this.removalReason != null; // Paper - Folia schedulers
          if (this.removalReason == null) {
-@@ -4865,7 +5178,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4870,7 +5183,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
              this.stopRiding();
          }
 
@@ -28720,7 +28720,7 @@ index 5ee3dc10cb4755fca83d8f7cad55d26b07afd6ff..346d9dfafab6dfe6f8253552d0e89ecd
          this.levelCallback.onRemove(removalReason);
          this.onRemoval(removalReason);
          // Paper start - Folia schedulers
-@@ -4899,7 +5212,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4904,7 +5217,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      public boolean shouldBeSaved() {
          return (this.removalReason == null || this.removalReason.shouldSave())
              && !this.isPassenger()
@@ -30929,7 +30929,7 @@ index 9d5f6433a1628cb2285f81f8c99dbee4d6c54d81..4fd746ccfd0018f5e551490e24aa6826
 
      public void animateTick(BlockState state, Level level, BlockPos pos, RandomSource random) {
 diff --git a/net/minecraft/world/level/block/state/BlockBehaviour.java b/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 5ad3b49fcf3d25e2309c29cf9fbc9a049402fde9..dff1c4fa389d5168bd9ec1aff4c7e4bc63c4110e 100644
+index af3dfdd85579d01b12d7b6bceec635015bb081f6..07777e331251b7e2c4fdcb63fee41f733e775004 100644
 --- a/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/net/minecraft/world/level/block/state/BlockBehaviour.java
 @@ -416,7 +416,7 @@ public abstract class BlockBehaviour implements FeatureElement {

paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch

@@ -464,7 +464,7 @@ index 135478a52cd106e6a3a0af9300a77ee5a871a400..ade0649a9fecbb84cebab3c44b4afe7f
      public void tick() {
          super.tick();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 346d9dfafab6dfe6f8253552d0e89ecd7e190312..681a4d7c0a40466997595d32cfb8aa902991e86b 100644
+index b46b976f74a9950f9ffc557a4bd7effe712d764b..84ec59e3c71faa093bef654b6d6e8b3751b1a442 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -368,6 +368,15 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
@@ -508,7 +508,7 @@ index 346d9dfafab6dfe6f8253552d0e89ecd7e190312..681a4d7c0a40466997595d32cfb8aa90
                  movement = this.limitPistonMovement(movement);
                  if (movement.equals(Vec3.ZERO)) {
                      return;
-@@ -1114,6 +1134,13 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -1117,6 +1137,13 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
                  this.stuckSpeedMultiplier = Vec3.ZERO;
                  this.setDeltaMovement(Vec3.ZERO);
              }
@@ -754,7 +754,7 @@ index 03af852776b595a5bc1cff01ed4d8d1c77999846..8497cd81b653beb06419ad7cfbf5c36f
      public void tick() {
          super.tick();
 diff --git a/net/minecraft/world/entity/projectile/FireworkRocketEntity.java b/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
-index e7195ad502f80fe7b30fdf28bd45967150a80da1..be9c8ba1e73d7348227139f7586a80f74c3e473f 100644
+index 6a02380f376d8aa5fd4e91b463321ac410a8df0c..9b13991088a5e5f4d7697588777e5252ae67b73a 100644
 --- a/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
 +++ b/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
 @@ -107,6 +107,21 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {

paper-server/patches/features/0021-Incremental-chunk-and-player-saving.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Incremental chunk and player saving
 
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 77aa4307fdbe9a52c4d35a7a74282f87a176da5e..853d4603249c19c31d4252fb0e411d5b41b851ad 100644
+index 0f4e9453d3f1a5a59357ef788acc6622091a4ed5..e24336c12b9efd0c9c5ec9cd7b37339fe67267db 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -886,7 +886,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -17,7 +17,7 @@ index 77aa4307fdbe9a52c4d35a7a74282f87a176da5e..853d4603249c19c31d4252fb0e411d5b
              var4 = this.saveAllChunks(suppressLogs, flush, force);
          } finally {
              this.isSaving = false;
-@@ -1471,9 +1471,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1474,9 +1474,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
 
          this.ticksUntilAutosave--;
@@ -50,7 +50,7 @@ index 77aa4307fdbe9a52c4d35a7a74282f87a176da5e..853d4603249c19c31d4252fb0e411d5b
          ProfilerFiller profilerFiller = Profiler.get();
          this.runAllTasks(); // Paper - move runAllTasks() into full server tick (previously for timings)
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 9aa154a7349ffb7b6af167fd84955168dbcd2bd9..5993a9530586e9792691e26d0a0a57febff5b447 100644
+index f609b9707b4265018b19dbc5a0191923035b7723..8891d2a8832a76ef4a0c62f43d0bbf9c68f05016 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -1371,6 +1371,26 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -81,7 +81,7 @@ index 9aa154a7349ffb7b6af167fd84955168dbcd2bd9..5993a9530586e9792691e26d0a0a57fe
          // Paper start - add close param
          this.save(progress, flush, skipSave, false);
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 0b41d4c924b77fe46089b2e5a0ebc92014a1f143..ff507ab2ec9391e899785fd42150fb4547eac83c 100644
+index 9967b8b90a20461ea5fb77250d5a6680ff2cf582..02e70eb361ee414d868e0e18ee3d00e14cbbd9a1 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -203,6 +203,7 @@ import org.slf4j.Logger;

paper-server/patches/features/0026-Optimise-EntityScheduler-ticking.patch

@@ -20,10 +20,10 @@ index a2fbc13105673e926cbaed69221826ebd392140f..a42938e1abd371dba6806e65552fde71
 
      @Override
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 853d4603249c19c31d4252fb0e411d5b41b851ad..c4b2eac96d3ab118cfc6b66e789b8aaa4d2a70ec 100644
+index e24336c12b9efd0c9c5ec9cd7b37339fe67267db..b717c1fb99f9c5ee356eea98550e6e79dc4777d8 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1591,33 +1591,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1594,33 +1594,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
 
@@ -67,10 +67,10 @@ index 853d4603249c19c31d4252fb0e411d5b41b851ad..c4b2eac96d3ab118cfc6b66e789b8aaa
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.DIALOG_CLICK_MANAGER.handleQueue(this.tickCount); // Paper
          profilerFiller.push("commandFunctions");
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 681a4d7c0a40466997595d32cfb8aa902991e86b..2d74876cd072e0fd0380bc53ed34da1cb1bc3a29 100644
+index 84ec59e3c71faa093bef654b6d6e8b3751b1a442..2f59bd23cb91234a0b176ade028b12e30d6e3159 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -5229,6 +5229,11 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -5234,6 +5234,11 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
          this.getBukkitEntity().taskScheduler.retire();
      }
      // Paper end - Folia schedulers

paper-server/patches/features/0029-Optimize-Hoppers.patch

@@ -48,10 +48,10 @@ index 0000000000000000000000000000000000000000..24a2090e068ad3c0d08705050944abdf
 +    }
 +}
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index c4b2eac96d3ab118cfc6b66e789b8aaa4d2a70ec..f0e16de0cd2e5794c0a86b54979d9ac043c704df 100644
+index b717c1fb99f9c5ee356eea98550e6e79dc4777d8..5461b22338858cad3f9b8834bccf4a68f09f8deb 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1646,6 +1646,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1649,6 +1649,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              serverLevel.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
              serverLevel.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
              serverLevel.updateLagCompensationTick(); // Paper - lag compensation