From 074f57b54d6414ea165d855921e6b09fd9124285 Mon Sep 17 00:00:00 2001
From: violetc <58360096+s-yh-china@users.noreply.github.com>
Date: Sat, 6 Sep 2025 23:30:16 +0800
Subject: [PATCH] Update Paper

---
 gradle.properties                                      |  2 +-
 .../features/0001-Build-changes.patch                  |  6 +++---
 .../features/0004-Leaves-Protocol-Core.patch           |  6 +++---
 .../features/0007-Leaves-Fakeplayer.patch              | 10 +++++-----
 .../0019-Config-to-disable-method-profiler.patch       |  4 ++--
 .../features/0038-Catch-update-suppression-crash.patch |  6 +++---
 .../features/0039-Bedrock-break-list.patch             |  4 ++--
 .../features/0072-Replay-Mod-API.patch                 | 10 +++++-----
 .../features/0136-Lithium-Sleeping-Block-Entity.patch  |  4 ++--
 ...tch => 0139-Modify-end-void-rings-generation.patch} |  0
 10 files changed, 26 insertions(+), 26 deletions(-)
 rename leaves-server/minecraft-patches/features/{0141-Modify-end-void-rings-generation.patch => 0139-Modify-end-void-rings-generation.patch} (100%)

diff --git a/gradle.properties b/gradle.properties
index 881786c4..20145e6e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group=org.leavesmc.leaves
 version=1.21.8-R0.1-SNAPSHOT
 mcVersion=1.21.8
-paperRef=614e9acfca696b98b810c65e3582993fcefc321e
+paperRef=9aaaadffaa0caad086cf04709904b47eaac161d7
 
 preVersion=false
 org.gradle.caching=true
diff --git a/leaves-server/minecraft-patches/features/0001-Build-changes.patch b/leaves-server/minecraft-patches/features/0001-Build-changes.patch
index ae01110d..6a7d78cd 100644
--- a/leaves-server/minecraft-patches/features/0001-Build-changes.patch
+++ b/leaves-server/minecraft-patches/features/0001-Build-changes.patch
@@ -18,10 +18,10 @@ index 42899a91b9061b85985fbbd0de4032c757f4aa8f..a93f00d1a64e4deb9b89435bab258f3b
      private static final org.slf4j.Logger LOGGER = com.mojang.logging.LogUtils.getLogger();
  
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 7aac2a6889af3edaebfaf94deecbf00d00758b68..d2895962ad3879632ff7a33eb3ce656097aebaec 100644
+index 9243bb11e3f968d0bf0eb2e3dc9295c0232bc15d..9ba90e9e1c6dae13579337edb5a5bede0daa4098 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1193,7 +1193,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1194,7 +1194,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.");
@@ -30,7 +30,7 @@ index 7aac2a6889af3edaebfaf94deecbf00d00758b68..d2895962ad3879632ff7a33eb3ce6560
                  LOGGER.info("*************************************************************************************");
              }
              // Paper end - Add onboarding message for initial server start
-@@ -1855,7 +1855,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1856,7 +1856,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
diff --git a/leaves-server/minecraft-patches/features/0004-Leaves-Protocol-Core.patch b/leaves-server/minecraft-patches/features/0004-Leaves-Protocol-Core.patch
index 878a87c9..877d4e3a 100644
--- a/leaves-server/minecraft-patches/features/0004-Leaves-Protocol-Core.patch
+++ b/leaves-server/minecraft-patches/features/0004-Leaves-Protocol-Core.patch
@@ -33,10 +33,10 @@ index fb263fa1f30a7dfcb7ec2656abfb38e5fe88eac9..56fd1ed7ccaf96e7eedea60fbdbf7f93
          };
      }
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index c0fa1bba36af367ea81fad4ef44dc25cb84eabd4..d6cd8ac3b44b170b5bb3a530deb406396d0fb7ae 100644
+index 9ba90e9e1c6dae13579337edb5a5bede0daa4098..eb6d5e82b6a2576af14c0c080a05a87022f90c93 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1744,6 +1744,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1745,6 +1745,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          profilerFiller.popPush("server gui refresh");
  
@@ -46,7 +46,7 @@ index c0fa1bba36af367ea81fad4ef44dc25cb84eabd4..d6cd8ac3b44b170b5bb3a530deb40639
              this.tickables.get(i).run();
          }
 diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 08c59d603fca038fc2dde36384eea1b6c971e659..2dd95aca955f19ce48be35b1ca9bcc94c3a1984d 100644
+index f02800e4e941b05bde6f0d5fac76e2b6ec5b9832..7a7090a2a7b41762d94cebf847cc6a795c9bc862 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -57,6 +57,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/leaves-server/minecraft-patches/features/0007-Leaves-Fakeplayer.patch b/leaves-server/minecraft-patches/features/0007-Leaves-Fakeplayer.patch
index 02ba8d4c..62d18af5 100644
--- a/leaves-server/minecraft-patches/features/0007-Leaves-Fakeplayer.patch
+++ b/leaves-server/minecraft-patches/features/0007-Leaves-Fakeplayer.patch
@@ -30,7 +30,7 @@ index 41005f6b9f53a9c1125ad5e08538d9f5aacb3571..3e9b8c5fb2157f767de8bddc3e767512
      private DisconnectionDetails disconnectionDetails;
      private boolean encrypted;
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index d6cd8ac3b44b170b5bb3a530deb406396d0fb7ae..367882c1cad3fd75c038931a1ecca729db27d0e5 100644
+index eb6d5e82b6a2576af14c0c080a05a87022f90c93..5c49816db8241694eed640a34c056effbf382934 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -304,6 +304,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -50,7 +50,7 @@ index d6cd8ac3b44b170b5bb3a530deb406396d0fb7ae..367882c1cad3fd75c038931a1ecca729
          // CraftBukkit start
          if (this.server != null) {
              this.server.spark.disable(); // Paper - spark
-@@ -1492,7 +1495,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1493,7 +1496,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          int i = this.pauseWhileEmptySeconds() * 20;
          this.removeDisabledPluginsBlockingSleep(); // Paper - API to allow/disallow tick sleeping
          if (i > 0) {
@@ -59,7 +59,7 @@ index d6cd8ac3b44b170b5bb3a530deb406396d0fb7ae..367882c1cad3fd75c038931a1ecca729
                  this.emptyTicks++;
              } else {
                  this.emptyTicks = 0;
-@@ -1762,6 +1765,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1763,6 +1766,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      public void tickConnection() {
          this.getConnection().tick();
@@ -67,7 +67,7 @@ index d6cd8ac3b44b170b5bb3a530deb406396d0fb7ae..367882c1cad3fd75c038931a1ecca729
      }
  
      private void synchronizeTime(ServerLevel level) {
-@@ -2814,6 +2818,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2815,6 +2819,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return 0;
      }
  
@@ -472,7 +472,7 @@ index f9e7532f86122a379692561a639a209a126e8bba..2412f46837e967694222730e68e7d25a
  
          for (WaypointTransmitter waypointTransmitter : this.waypoints) {
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 61530843a32632f54f3d4ad913e649ee2dca3f38..d5051d8a2b0af5d8b63a0d10987c0a7ee7114ff0 100644
+index 541bd2361b094f04dc2705979204930c564f8323..05730869d237439d3988635d4c8b048a7b654ca7 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1173,7 +1173,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaves-server/minecraft-patches/features/0019-Config-to-disable-method-profiler.patch b/leaves-server/minecraft-patches/features/0019-Config-to-disable-method-profiler.patch
index 4a65a666..d19662fb 100644
--- a/leaves-server/minecraft-patches/features/0019-Config-to-disable-method-profiler.patch
+++ b/leaves-server/minecraft-patches/features/0019-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/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index feb5fc93498a5ed89e3bcb61cd72ba6e75881358..6539574b72dcb362d8d106a68d6e2d968340fc5e 100644
+index 5c49816db8241694eed640a34c056effbf382934..af5fde7121211887672045c00aa404e2f68c43c1 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1248,7 +1248,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1249,7 +1249,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  lastTick = currentTime;
                  this.nextTickTimeNanos += l;
  
diff --git a/leaves-server/minecraft-patches/features/0038-Catch-update-suppression-crash.patch b/leaves-server/minecraft-patches/features/0038-Catch-update-suppression-crash.patch
index 99dfdc90..a1b0a66b 100644
--- a/leaves-server/minecraft-patches/features/0038-Catch-update-suppression-crash.patch
+++ b/leaves-server/minecraft-patches/features/0038-Catch-update-suppression-crash.patch
@@ -30,10 +30,10 @@ index 4535858701b2bb232b9d2feb2af6551526232ddc..03e70445dfe14c119284f7c301127075
                              throw makeReportedException(var4, packet, processor);
                          }
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 3aa719636ea2b68463a7f412a9cbd5bf3a7925a7..498102c2553f12badff29bed98ce30528162e536 100644
+index 4cc0bb9c612986934bf44f933aa402b3787394ba..2545c7ebbe4bab45ea22d3843d42c7e55941387e 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1725,7 +1725,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1726,7 +1726,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              try {
                  serverLevel.tick(hasTimeLeft);
@@ -84,7 +84,7 @@ index 895cee538086e0494eb0f57c6e6b32ccd43e72e7..e355939e153c05f9434482c471374375
              CrashReport crashReport = CrashReport.forThrowable(var4, "Ticking player");
              CrashReportCategory crashReportCategory = crashReport.addCategory("Player being ticked");
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index e6457e07e7e8e7690d160020b92fbc6874c1ec82..f8e0275ebac65edfca3e8bb5d53001becd9a963f 100644
+index d06e5719e62b500432bb6fcb60d6049b8379c17d..df01a171a8073b6a7ef16248bd09b4c902227887 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1351,9 +1351,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaves-server/minecraft-patches/features/0039-Bedrock-break-list.patch b/leaves-server/minecraft-patches/features/0039-Bedrock-break-list.patch
index 2d96b753..b22605c5 100644
--- a/leaves-server/minecraft-patches/features/0039-Bedrock-break-list.patch
+++ b/leaves-server/minecraft-patches/features/0039-Bedrock-break-list.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bedrock break list
 
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 498102c2553f12badff29bed98ce30528162e536..5e1a8ce2e772427fd8fc2b6794575e36d5c7d655 100644
+index 2545c7ebbe4bab45ea22d3843d42c7e55941387e..cbc9f4fbad0a88bc324111a7ce80c2880ed1d3be 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1757,6 +1757,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1758,6 +1758,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          profilerFiller.popPush("server gui refresh");
  
          org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(tickCount); // Leaves - protocol
diff --git a/leaves-server/minecraft-patches/features/0072-Replay-Mod-API.patch b/leaves-server/minecraft-patches/features/0072-Replay-Mod-API.patch
index 67a4d107..5af98f0f 100644
--- a/leaves-server/minecraft-patches/features/0072-Replay-Mod-API.patch
+++ b/leaves-server/minecraft-patches/features/0072-Replay-Mod-API.patch
@@ -80,10 +80,10 @@ index 514f8fbdeb776087608665c35de95294aadf5cf0..b75772897cabc3e7c59301d451685378
                              players.add(serverPlayer1);
                              if (players.size() >= resultLimit) {
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 5e1a8ce2e772427fd8fc2b6794575e36d5c7d655..1241b008d66bacd8640302a6dbf52a2e592b29b9 100644
+index cbc9f4fbad0a88bc324111a7ce80c2880ed1d3be..64b2a52ec6c4df487a9bb8ed540a429adbb6f10f 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1638,7 +1638,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1639,7 +1639,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      private ServerStatus.Players buildPlayerStatus() {
@@ -92,7 +92,7 @@ index 5e1a8ce2e772427fd8fc2b6794575e36d5c7d655..1241b008d66bacd8640302a6dbf52a2e
          int maxPlayers = this.getMaxPlayers();
          if (this.hidesOnlinePlayers()) {
              return new ServerStatus.Players(maxPlayers, players.size(), List.of());
-@@ -1857,7 +1857,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1858,7 +1858,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @Override
      public int getPlayerCount() {
@@ -101,7 +101,7 @@ index 5e1a8ce2e772427fd8fc2b6794575e36d5c7d655..1241b008d66bacd8640302a6dbf52a2e
      }
  
      @Override
-@@ -2251,7 +2251,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2252,7 +2252,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      if (Thread.currentThread() != this.serverThread) return; // Paper
                      // Paper start - we don't need to save everything, just advancements
                      // this.getPlayerList().saveAll();
@@ -110,7 +110,7 @@ index 5e1a8ce2e772427fd8fc2b6794575e36d5c7d655..1241b008d66bacd8640302a6dbf52a2e
                          player.getAdvancements().save();
                      }
                      // Paper end - we don't need to save everything, just advancements
-@@ -2390,7 +2390,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2391,7 +2391,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              if (!playerList.isUsingWhitelist()) return; // Paper - whitelist not enabled
              UserWhiteList whiteList = playerList.getWhiteList();
  
diff --git a/leaves-server/minecraft-patches/features/0136-Lithium-Sleeping-Block-Entity.patch b/leaves-server/minecraft-patches/features/0136-Lithium-Sleeping-Block-Entity.patch
index 4e1423c1..d802fc60 100644
--- a/leaves-server/minecraft-patches/features/0136-Lithium-Sleeping-Block-Entity.patch
+++ b/leaves-server/minecraft-patches/features/0136-Lithium-Sleeping-Block-Entity.patch
@@ -111,13 +111,13 @@ index 86cac164a2bf0e76528396e6aabbfd64cfc29559..da99b4bc7fe8460945070915073be141
  
      int getContainerSize();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 6b56178967872923be58983ce8b14102ec0c3e14..7a85d94f333b6e1def5926b5b7727c22da0a203f 100644
+index b1b0e2b4deb5830660961cfff4669c4fd7037663..4748bd188f8860ed2a8b2e6123e020c1da17af5f 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -309,7 +309,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      private static final EntityDataAccessor<Boolean> DATA_NO_GRAVITY = SynchedEntityData.defineId(Entity.class, EntityDataSerializers.BOOLEAN);
      protected static final EntityDataAccessor<Pose> DATA_POSE = SynchedEntityData.defineId(Entity.class, EntityDataSerializers.POSE);
-     private static final EntityDataAccessor<Integer> DATA_TICKS_FROZEN = SynchedEntityData.defineId(Entity.class, EntityDataSerializers.INT);
+     public static final EntityDataAccessor<Integer> DATA_TICKS_FROZEN = SynchedEntityData.defineId(Entity.class, EntityDataSerializers.INT);
 -    private EntityInLevelCallback levelCallback = EntityInLevelCallback.NULL;
 +    public EntityInLevelCallback levelCallback = EntityInLevelCallback.NULL; // Leaves - private -> public
      private final VecDeltaCodec packetPositionCodec = new VecDeltaCodec();
diff --git a/leaves-server/minecraft-patches/features/0141-Modify-end-void-rings-generation.patch b/leaves-server/minecraft-patches/features/0139-Modify-end-void-rings-generation.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0141-Modify-end-void-rings-generation.patch
rename to leaves-server/minecraft-patches/features/0139-Modify-end-void-rings-generation.patch