Update to 1.21.11-rc3

Author: jpenilla

gradle.properties

@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.21.11-rc2-R0.1-SNAPSHOT
-mcVersion=1.21.11-rc2
+version=1.21.11-rc3-R0.1-SNAPSHOT
+mcVersion=1.21.11-rc3
 # This is the current API version for use in (paper-)plugin.yml files
 # During snapshot cycles this should be the anticipated version of the release target
 apiVersion=1.21.11

paper-server/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
 
 dependencies {
-    mache("io.papermc:mache:1.21.11-rc2+build.1")
+    mache("io.papermc:mache:1.21.11-rc3+build.1")
     paperclip("io.papermc:paperclip:3.0.3")
 }
 

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

@@ -464,7 +464,7 @@ index 5461bd9a39bb20ad29d3bc110c38860cf35a770a..75f80787966cdda6f51f55a8f6cb2218
      public void tick() {
          super.tick();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 9cd31bf05ef7e5b14696cb33bbf995a9405481e3..e491170cd817b5f2a6951456d36b4ca1bf45c15f 100644
+index 1f6576fea282cc68d5192019fc7d5dabc3703c43..edb47c2f3b3f4b3180f51e616ed1e633dcf96e43 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
@@ -523,7 +523,7 @@ index 9cd31bf05ef7e5b14696cb33bbf995a9405481e3..e491170cd817b5f2a6951456d36b4ca1
              movement = this.maybeBackOffFromEdge(movement, type);
              Vec3 vec3 = this.collide(movement);
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index b89e05476fca18847d86d953039e66613a1a9976..0a2f85bbab4f464ee4e2357b20f93ddeaabea262 100644
+index 45528ff5210625c530af06af0acc79b993b35dcd..df02ff9e9ad844d0fcb3950ce18914993a722056 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -3318,6 +3318,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -542,7 +542,7 @@ index b89e05476fca18847d86d953039e66613a1a9976..0a2f85bbab4f464ee4e2357b20f93dde
      public void tick() {
          super.tick();
 diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
-index 6ab728f46369d11bc97f3bc44fb1a30ea88a9854..9c754488ac24222b10b093f66e8492dfa5fe48f7 100644
+index 43c3d5a7cb4303d4f4a0de9209ebe4e6c22e1a65..a6ed274cb0cf86a1ca93588f946ed52a58354546 100644
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
 @@ -217,6 +217,19 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -818,7 +818,7 @@ index 4a6384a668546371f4ffa13927be4bd462d47c60..3c961b76769f16160caedce8ec32bb2a
 +
  }
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index ef09aaebf4fc7fcd24a736434cd0a860d6b97905..fd8b41b3f1ee64ec30895d787c282eaf108ea402 100644
+index c94eae678dd55fced81fcee683ca3c0e16443c7c..3d5a869d1d7da490ec843ab2137ceeddc0a5fa0d 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
 @@ -150,6 +150,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl

paper-server/patches/features/0005-Use-Velocity-compression-and-cipher-natives.patch

@@ -267,7 +267,7 @@ index 35b8a2bddeefff2b1ba8ed75ec780c41d59ce92f..1baa8daf880c5f87f1d72ecf0e1b93c7
 +    // Paper end - Use Velocity cipher
  }
 diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
-index 095e8040df7786bf92d9a7ad59fd8ef21235b945..8bded92b1002e292dfb053109d1683690aa45139 100644
+index 8817a2d6500d1bdce96d87dc8f7f364ccfa390e5..19ec939529eb638bdc4d7fd9260f161fae118314 100644
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
 @@ -728,11 +728,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {

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

@@ -81,7 +81,7 @@ index db2054e84f5717a37683d57890dcd585769effbc..f0bfc37a0802397da1462e545e48f83d
          // 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 8688d1eb7427b8d07757af84d615781867a34288..d72f208f6924aeb1f6531c53f8f01851fa26f196 100644
+index 55d27aa4cff91ea61ff2ab9256acd2cd8694304a..d4466c7d30f47614a70d9ef24002a2d39182b8f6 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/0025-Optional-per-player-mob-spawns.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Optional per player mob spawns
 
 
 diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
-index dfd7a60192c46f01d245045adf86dec42eec4da7..0bf14bf6ece5136f9c9972439076c33a7036be5c 100644
+index d3929074fb2ae60b0b7491901598dfdfa251fe55..e6b7646f683ba4dad8a108fe8498b95fe53f7f1c 100644
 --- a/net/minecraft/server/level/ChunkMap.java
 +++ b/net/minecraft/server/level/ChunkMap.java
 @@ -247,11 +247,29 @@ public class ChunkMap extends SimpleRegionStorage implements ChunkHolder.PlayerP
@@ -77,7 +77,7 @@ index 75fe6e026e3f91b66dcf5b97a86491d5277f7661..9b8222bda0f119f272d90f980c9f9540
              profiler.popPush("tickSpawningChunks");
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index d72f208f6924aeb1f6531c53f8f01851fa26f196..b3d9c359d091637e6911b17483cf594099aa61f4 100644
+index d4466c7d30f47614a70d9ef24002a2d39182b8f6..a98eb760677b0337d2da9560148a55862fc4d721 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -409,6 +409,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc

paper-server/patches/features/0026-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Improve cancelling PreCreatureSpawnEvent with per player mob
 
 
 diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
-index 0bf14bf6ece5136f9c9972439076c33a7036be5c..6f32fb08788605ebf00839d412a7f4d78137aadf 100644
+index e6b7646f683ba4dad8a108fe8498b95fe53f7f1c..ab8893163ac85971a470e4a4d6fa76bd174e2bae 100644
 --- a/net/minecraft/server/level/ChunkMap.java
 +++ b/net/minecraft/server/level/ChunkMap.java
 @@ -266,8 +266,25 @@ public class ChunkMap extends SimpleRegionStorage implements ChunkHolder.PlayerP
@@ -60,7 +60,7 @@ index 9b8222bda0f119f272d90f980c9f9540211af84a..af67b07722bb0125acd081dab767d7e7
              spawnState = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true);
          } else {
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index b3d9c359d091637e6911b17483cf594099aa61f4..791296eb42c961287db7ce8e56959910cc3b04e1 100644
+index a98eb760677b0337d2da9560148a55862fc4d721..c855c48ede60eb744cc65e1b560b9a7a3417d8aa 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -413,6 +413,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc