Update Paper

gradle.properties

@@ -1,7 +1,7 @@
 group=org.leavesmc.leaves
 version=1.21.3-R0.1-SNAPSHOT
 mcVersion=1.21.3
-paperRef=27e4ddcd067d4825eb01cb05d6975c46252eeafa
+paperRef=da7138233f6392e791d790d1c3407414c855f9c2
 preVersion=true
 org.gradle.jvmargs=-Xmx2G
 org.gradle.caching=true

patches/api/0002-Add-isShrink-to-EntityResurrectEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add isShrink to EntityResurrectEvent
 
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityResurrectEvent.java b/src/main/java/org/bukkit/event/entity/EntityResurrectEvent.java
-index 2f6ad5c2fc7ae7cf22cb424df3543c24f3ee6ebe..379237368070555890f07e71b003d2c42d8ab2b0 100644
+index 372825dc8ae52983f0e8ff2fd80e02887f0044ad..2a598f7dc7de0be7a83a4f7a52ec22c42f417c71 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityResurrectEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityResurrectEvent.java
 @@ -15,19 +15,43 @@ import org.jetbrains.annotations.Nullable;
@@ -30,7 +30,7 @@ index 2f6ad5c2fc7ae7cf22cb424df3543c24f3ee6ebe..379237368070555890f07e71b003d2c4
 +        this(what, hand, true);
 +    }
 +
-     @Deprecated
+     @Deprecated(since = "1.19.2")
      public EntityResurrectEvent(@NotNull LivingEntity what) {
 -        this(what, null);
 +        this(what, null, true);

patches/server/0001-Build-changes.patch

@@ -197,10 +197,10 @@ index 790bad0494454ca12ee152e3de6da3da634d9b20..c060857cb0551fff8f5033553b887f3a
      private static final String BUILD_DEV = "DEV";
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 780582ebaa8deb0c0b0c8de17de5abcebafa4bd3..5201b1aaedabdf6021ea9ac3f84be70a6d03aa8f 100644
+index 4158473fd553a16fec23bcbcf9a278d413120600..9af88810bc722d7cb6d00db5b239ad3e55df53c1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1263,7 +1263,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1264,7 +1264,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  LOGGER.info("*************************************************************************************");
                  LOGGER.info("This is the first time you're starting this server.");
                  LOGGER.info("It's recommended you read our 'Getting Started' documentation for guidance.");
@@ -209,7 +209,7 @@ index 780582ebaa8deb0c0b0c8de17de5abcebafa4bd3..5201b1aaedabdf6021ea9ac3f84be70a
                  LOGGER.info("*************************************************************************************");
              }
              // Paper end - Add onboarding message for initial server start
-@@ -2010,7 +2010,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2011,7 +2011,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      @DontObfuscate
      public String getServerModName() {

patches/server/0007-Leaves-Protocol-Core.patch

@@ -47,10 +47,10 @@ index 1967c43ee3a12e63365cc40ee6565307e2fd73cf..6e376d0db5321d8e9b6e0b54617ffd17
 
          assert isValidPath(path);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ec5f7e652a05f35c2e6cbe31a63a980a2a476fb6..7518f8d633a6d348f9b86a12033eca3a9dad922c 100644
+index 36f32afc62d9ab9ab48b4b5a25539333297dfa54..94ee464e8706245f37aed622a71907d6983a1636 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1893,6 +1893,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1894,6 +1894,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
          gameprofilerfiller.popPush("server gui refresh");
 
@@ -84,7 +84,7 @@ index b0bc66dc7248aae691dcab68b925b52a1695e63f..8344c7f953fc465ee9f43e1f81e2eb06
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 30de3d1a7792c38ae946f19cb0e14637919b5001..9b1645cf1fa47b8d7592c7eda4a4497ad9d6bbf8 100644
+index 1a956249828156fdc273888de59128c3d1a0b898..e0eb02f60fd29610c7c5fde1123801ed890bd903 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -353,6 +353,8 @@ public abstract class PlayerList {

patches/server/0008-Fix-trading-with-the-void.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix trading with the void
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b4027f5cf90935a1fe3ab2c28b0bcbb55a7b541b..1d3f8b2c040b64e0f8548409a731d7f47d127f2c 100644
+index 585e2b43a0326f0b81597fa1234d3c67c76af550..7d88402b024a5c11e1796d9bccdc1c352650ad07 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2753,11 +2753,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2761,11 +2761,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              // Spigot end
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message

patches/server/0010-Fakeplayer-support.patch

@@ -47,7 +47,7 @@ index e693a003ea8f022eef8b49e4332025b769333b30..49e03ba7c04381e263aaee5cda9ed6c0
      private DisconnectionDetails disconnectionDetails;
      private boolean encrypted;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7518f8d633a6d348f9b86a12033eca3a9dad922c..f0d2c8bc40b36e6d638ad418963289ac2737f5a0 100644
+index 94ee464e8706245f37aed622a71907d6983a1636..186813428916c93545b7bad706b8584a4e338627 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -331,6 +331,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -68,23 +68,23 @@ index 7518f8d633a6d348f9b86a12033eca3a9dad922c..f0d2c8bc40b36e6d638ad418963289ac
          this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
          this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
          this.server.spark.enableAfterPlugins(this.server); // Paper - spark
-@@ -1050,6 +1054,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1051,6 +1055,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
 +        this.getBotList().removeAll(); // Leaves - save or remove bot
          // CraftBukkit start
          if (this.server != null) {
              this.server.spark.disable(); // Paper - spark
-@@ -1914,6 +1919,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1915,6 +1920,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      public void tickConnection() {
          this.getConnection().tick();
 +        this.botList.networkTick(); // Leaves - fakeplayer
      }
 
      private void synchronizeTime(ServerLevel world) {
-@@ -3101,6 +3107,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -3102,6 +3108,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return 0;
      }
 
@@ -130,7 +130,7 @@ index a8c5fa172b01b85df51fa3b4d20b6c4f734dfdda..9b1e6effb8bf852957dba92a54688932
          org.spigotmc.SpigotConfig.init((java.io.File) this.options.valueOf("spigot-settings"));
          org.spigotmc.SpigotConfig.registerCommands();
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 52a6a4badace15a983f0acb431036bd704d9cebd..9a226396b4c38768574d5785744f22e61d6913f3 100644
+index cfeeddf2cb4ff50dbc29c6913e78ca1dee076790..83872d0d8d2021f7c676abcd7ea95ec8aad896fb 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1304,6 +1304,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -148,7 +148,7 @@ index 52a6a4badace15a983f0acb431036bd704d9cebd..9a226396b4c38768574d5785744f22e6
 
              }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1d3f8b2c040b64e0f8548409a731d7f47d127f2c..1b1350485ba333e9bda048b01273de9744ce16a9 100644
+index 7d88402b024a5c11e1796d9bccdc1c352650ad07..54664ef970a93d3e41c0f39506ae7b32946ad193 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -231,6 +231,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -167,7 +167,7 @@ index 1d3f8b2c040b64e0f8548409a731d7f47d127f2c..1b1350485ba333e9bda048b01273de97
      }
 
      // Paper start
-@@ -2179,6 +2181,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2187,6 +2189,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          return this.players;
      }
 
@@ -180,7 +180,7 @@ index 1d3f8b2c040b64e0f8548409a731d7f47d127f2c..1b1350485ba333e9bda048b01273de97
      @Override
      public void onBlockStateChange(BlockPos pos, BlockState oldBlock, BlockState newBlock) {
          Optional<Holder<PoiType>> optional = PoiTypes.forState(oldBlock);
-@@ -2685,6 +2693,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2693,6 +2701,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              // ServerLevel.this.getChunkSource().addEntity(entity); // Paper - ignore and warn about illegal addEntity calls instead of crashing server; moved down below valid=true
              if (entity instanceof ServerPlayer entityplayer) {
                  ServerLevel.this.players.add(entityplayer);
@@ -192,7 +192,7 @@ index 1d3f8b2c040b64e0f8548409a731d7f47d127f2c..1b1350485ba333e9bda048b01273de97
                  ServerLevel.this.updateSleepingPlayerList();
              }
 
-@@ -2762,6 +2775,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2770,6 +2783,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              ServerLevel.this.getChunkSource().removeEntity(entity);
              if (entity instanceof ServerPlayer entityplayer) {
                  ServerLevel.this.players.remove(entityplayer);
@@ -270,7 +270,7 @@ index 5a8f396d47577f087abb415c972fd4f51e50faba..ebae6c704844755c75aa0c6f460603c5
                  PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
                  this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9b1645cf1fa47b8d7592c7eda4a4497ad9d6bbf8..9b3fbc13779ded07c696e151772d834ff8d61a7d 100644
+index e0eb02f60fd29610c7c5fde1123801ed890bd903..bc8764fcf0aedcf11d4826738a89300262cf299c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -124,6 +124,8 @@ import org.bukkit.event.player.PlayerRespawnEvent.RespawnReason;
@@ -556,10 +556,10 @@ index 3435629606def598ca998fb41ef303677c4cbea4..26ef09c86315c1125167af044323dbd3
 +    // Leaves end - Bot API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8f234b46c24a0ae08aa5f8190c5b27e1f62dfbab..df51d6d7909d407d8dcdbe1bfc5ca3a423005d5c 100644
+index 57da11c0da7322e74810e7108e9c8000b0c36520..d47bab785d7be71155c964ef13e839768797c9cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -241,7 +241,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -242,7 +242,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
 
      @Override
      public int getPlayerCount() {
@@ -568,7 +568,7 @@ index 8f234b46c24a0ae08aa5f8190c5b27e1f62dfbab..df51d6d7909d407d8dcdbe1bfc5ca3a4
      }
 
      @Override
-@@ -1285,9 +1285,9 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1286,9 +1286,9 @@ public class CraftWorld extends CraftRegionAccessor implements World {
 
      @Override
      public List<Player> getPlayers() {
@@ -580,7 +580,7 @@ index 8f234b46c24a0ae08aa5f8190c5b27e1f62dfbab..df51d6d7909d407d8dcdbe1bfc5ca3a4
              HumanEntity bukkitEntity = human.getBukkitEntity();
 
              if ((bukkitEntity != null) && (bukkitEntity instanceof Player)) {
-@@ -1960,7 +1960,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1965,7 +1965,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public void playSound(final net.kyori.adventure.sound.Sound sound) {
          org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper
          final long seed = sound.seed().orElseGet(this.world.getRandom()::nextLong);
@@ -589,7 +589,7 @@ index 8f234b46c24a0ae08aa5f8190c5b27e1f62dfbab..df51d6d7909d407d8dcdbe1bfc5ca3a4
              player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player.getX(), player.getY(), player.getZ(), seed, null));
          }
      }
-@@ -1988,7 +1988,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1993,7 +1993,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper
          final long seed = sound.seed().orElseGet(this.getHandle().getRandom()::nextLong);
          if (emitter == net.kyori.adventure.sound.Sound.Emitter.self()) {
@@ -598,7 +598,7 @@ index 8f234b46c24a0ae08aa5f8190c5b27e1f62dfbab..df51d6d7909d407d8dcdbe1bfc5ca3a4
                  player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player, seed, null));
              }
          } else if (emitter instanceof CraftEntity craftEntity) {
-@@ -2212,7 +2212,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2217,7 +2217,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
              Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
          }
          this.getHandle().sendParticles(

patches/server/0022-Config-to-disable-method-profiler.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Config to disable method profiler
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f0d2c8bc40b36e6d638ad418963289ac2737f5a0..feaf9b26c12f4da94aedfdab7362c8d94c7a72eb 100644
+index 186813428916c93545b7bad706b8584a4e338627..10d56397dbdf98668489b6968dc66ff138aa9d5f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1321,7 +1321,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1322,7 +1322,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  this.nextTickTimeNanos += i;
 
                  try {

patches/server/0044-Fix-update-suppression-crash.patch

@@ -20,10 +20,10 @@ index 1f7f68aad97ee73763c042837f239bdc7167db55..1e8025ecb14acc7c24917793c97f5435
                          if (exception instanceof ReportedException) {
                              ReportedException reportedexception = (ReportedException) exception;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 10108b66622128c90be01d5fa83c8dca6647c354..0badf81ac6c141b8736758eef1e93af9baf66d33 100644
+index 4b69ccad6ae14c2c037fd324174bcb65e6308d84..6e75b3832a7986d7818868c422edd018f6fcc862 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1874,7 +1874,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1875,7 +1875,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              gameprofilerfiller.push("tick");
 
              try {

patches/server/0045-Bedrock-break-list.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Bedrock break list
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0badf81ac6c141b8736758eef1e93af9baf66d33..98d1e4c934e25e5c0dfe844e6aa3dd236d411da0 100644
+index 6e75b3832a7986d7818868c422edd018f6fcc862..21a8c087dfe93ff6570d17e2757fe4c2250b3245 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1906,6 +1906,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1907,6 +1907,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
          org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol
 

patches/server/0061-No-block-update-command.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] No block update command
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1b2ba3ff09b27ea74afc96735e48a474cf6ebddd..e52c490540319db13a2b23f839f7fd88aeadda64 100644
+index 67f67d185c7578a5f25e077467eff2873e0ed174..cd6d1e625d5b22acf279be22da158d827686a922 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2453,6 +2453,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2461,6 +2461,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
 
      @Override
      public void blockUpdated(BlockPos pos, Block block) {

patches/server/0087-Force-peaceful-mode-switch.patch

@@ -98,10 +98,10 @@ index f817fd922ffcf857e8a5fc803b10421f640a8cd1..d5ece1268e7cab245a2ef2885bb83323
              boolean spawnThisTick = true;
              int limit = enumcreaturetype.getMaxInstancesPerChunk();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index df51d6d7909d407d8dcdbe1bfc5ca3a423005d5c..43a698baf88c7be00abbff517b95abc07ab67765 100644
+index d47bab785d7be71155c964ef13e839768797c9cb..469a019a4fe850a3a20a1232592e51b588387d6f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2410,6 +2410,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2415,6 +2415,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
 
      // Paper - replace feature flag API