Update Paper

gradle.properties

@@ -4,5 +4,5 @@ version=1.19.4-R0.1-SNAPSHOT
 mcVersion=1.19.4
 packageVersion=1_19_R3
 org.gradle.jvmargs=-Xmx2G
-paperRef=641dafd0a85badcfc5da7f53a99e5f7eac4ec015
+paperRef=29b17a892d11697dce9ee35d8eab593bb4748fb1
 preVersion=false

patches/server/0001-Build-changes.patch

@@ -92,7 +92,7 @@ index 9f15d9dbdfa74a0640b1a2b4ff695609d4758a4c..e5d4c3eb2f6bfe446d6520564a263dbc
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4cd95134811fd65465681d159b2f30cf77455830..f36dd47008ba6f2668c803a3b75e2edaef6b19e5 100644
+index 0ba8446065def1b120fd73241de5bc14d60d3b82..fe97a756c466b370aa2ff9cafeb64ff73b271c54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -256,7 +256,7 @@ import javax.annotation.Nullable; // Paper
@@ -105,15 +105,15 @@ index 4cd95134811fd65465681d159b2f30cf77455830..f36dd47008ba6f2668c803a3b75e2eda
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 4966a1e3dd35357a8ea6a7d2944c84c9c3e9058e..7a561b5bf13dfa37004980705c05fdb4189449df 100644
+index 755c223ab2a046285eb9916b6195093714f4c5ba..5891f67ccdddaa137a77ef2a2742fb965bdca6ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -285,7 +285,7 @@ public class Main {
                      if (buildDate.before(deadline.getTime())) {
                          // Paper start - This is some stupid bullshit
                          System.err.println("*** Warning, you've not updated in a while! ***");
--                        System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads ***"); // Paper
-+                        System.err.println("*** Please download a new build as per instructions from https://github.com/LeavesMC/Leaves/releases ***"); // Leaves
+-                        System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper
++                        System.err.println("*** Please download a new build as per instructions from https://github.com/LeavesMC/Leaves/releases ***"); //Paper // Leaves
                          //System.err.println("*** Server will start in 20 seconds ***");
                          //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
                          // Paper End

patches/server/0006-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 5a5ff40df37db9cbd53c584ed26a3ce4888b29c0..816b531b9d2acfc5c3d6414cc5ad49d178f65f7f 100644
+index 3bb63a652aca3c23f5f1bbf9cb70fce6540f2e33..431ec5a4486b0bf4f6b2ddc1d21187fb64fdc50f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2597,11 +2597,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2602,11 +2602,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // 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/0027-Optimize-random-calls-in-chunk-ticking.patch

@@ -22,7 +22,7 @@ index 6a2adfe51b5ea6b3290349781f41ed7818f15fe5..928139e8d0f7b65e2376d3c89d7bea29
              boolean flag1 = level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b1950cd42cb7890309c1fb591110b6b9e4d37e51..03a4e114a3383ce779a6fc48747834b33b480f66 100644
+index 8925adb86fb0a9f163030d8ed73bb47b8266b7b0..b06a79cbf4ab0fe3ff6f2f9a2d4697e6bf237d60 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -796,6 +796,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -58,7 +58,7 @@ index b1950cd42cb7890309c1fb591110b6b9e4d37e51..03a4e114a3383ce779a6fc48747834b3
              this.getRandomBlockPosition(j, 0, k, 15, blockposition);
              int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 28e4b302284f955a73e75d0f4276d55fb51826f5..1bf1af06fbd6501e98def7997c487c425d6a1623 100644
+index d190bad5d287766ed4165ed827d9901a9d878687..19012c60ea6f725248f7e4a18d78eb1025f4b3a4 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -88,6 +88,18 @@ public class LevelChunk extends ChunkAccess {
@@ -80,10 +80,11 @@ index 28e4b302284f955a73e75d0f4276d55fb51826f5..1bf1af06fbd6501e98def7997c487c42
      public LevelChunk(Level world, ChunkPos pos) {
          this(world, pos, UpgradeData.EMPTY, new LevelChunkTicks<>(), new LevelChunkTicks<>(), 0L, (LevelChunkSection[]) null, (LevelChunk.PostLoadProcessor) null, (BlendingData) null);
      }
-@@ -118,6 +130,11 @@ public class LevelChunk extends ChunkAccess {
+@@ -116,6 +128,12 @@ public class LevelChunk extends ChunkAccess {
+         this.postLoad = entityLoader;
+         this.blockTicks = blockTickScheduler;
          this.fluidTicks = fluidTickScheduler;
-         // CraftBukkit start
-         this.bukkitChunk = new org.bukkit.craftbukkit.CraftChunk(this);
++        
 +        // Leaves start - initialize lightning tick
 +        if (top.leavesmc.leaves.LeavesConfig.optimizeChunkTicking) {
 +            this.lightningTick = this.level.getThreadUnsafeRandom().nextInt(100000) << 1;
@@ -91,7 +92,7 @@ index 28e4b302284f955a73e75d0f4276d55fb51826f5..1bf1af06fbd6501e98def7997c487c42
 +        // Leaves end - initialize lightning tick
      }
  
-     public org.bukkit.Chunk bukkitChunk;
+     // CraftBukkit start
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 index 240fe801ba2670f5986faa58b77c7902f0465fc6..64215f03789db0555422c4b0aec32c8a4504cb4d 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java

patches/server/0046-BBOR-Protocol.patch

@@ -32,7 +32,7 @@ index 1ca5f2c544b3c7e0bb2b45a4b2ea1d1c71b18dfb..221bc8da4bf4df53e1b991139eb48461
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
                  this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2be065c247afd4483afe27ceebc965393f843982..c7cf8ba0b69be3dc55cc76ccc69b110eebd998c5 100644
+index 571b93a9c272fb6c79938e5b1486317532e8db29..f442ce31454a3472a0f6590f8abf06525029fb1c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -345,6 +345,7 @@ public abstract class PlayerList {
@@ -61,10 +61,10 @@ index 2be065c247afd4483afe27ceebc965393f843982..c7cf8ba0b69be3dc55cc76ccc69b110e
  
      public boolean isAllowCheatsForAllPlayers() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 78dc041216f13bc9aaa9bef2aeba34601e7239da..228ca319cdf1dc0d853271cbfae510aa11203a1b 100644
+index 19012c60ea6f725248f7e4a18d78eb1025f4b3a4..3a093befff648b394afd51d44b85f93503926561 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -1062,6 +1062,11 @@ public class LevelChunk extends ChunkAccess {
+@@ -1058,6 +1058,11 @@ public class LevelChunk extends ChunkAccess {
  
      public void setLoaded(boolean loadedToWorld) {
          this.loaded = loadedToWorld;
@@ -77,7 +77,7 @@ index 78dc041216f13bc9aaa9bef2aeba34601e7239da..228ca319cdf1dc0d853271cbfae510aa
  
      public Level getLevel() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d063b50ae1bcb9757d05ede7fb6805d34cac03f3..ba4eca55cb187df5d000aa3aad9ff67051f1596b 100644
+index e4189f444da906d89d7c910c4f0e61e058bc31ab..97ddfc93ddcb8241135d51f742281ed67cd716fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -965,6 +965,13 @@ public final class CraftServer implements Server {