From c29e73b9922eb76f600f1c9b7dcd493aeaaf82c4 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Fri, 10 Oct 2025 21:55:21 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@056268ed [ci/skip] Correct javadoc for Weapon Component (#13096)
PaperMC/Paper@a0ea7297 Fix minimum tick time reporting and off thread reading
---
 gradle.properties                                  |  2 +-
 .../minecraft-patches/features/0001-Ridables.patch |  4 ++--
 .../minecraft/server/MinecraftServer.java.patch    | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e03e858da..68f3fdc54 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.10-R0.1-SNAPSHOT
 
 mcVersion = 1.21.10
-paperCommit = fba780d6a2948d5a42030a80cf79cb49a8472456
+paperCommit = a0ea7297c52bd5aee889c5c1b101c7d593c049b0
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true
diff --git a/purpur-server/minecraft-patches/features/0001-Ridables.patch b/purpur-server/minecraft-patches/features/0001-Ridables.patch
index c201abf29..6a358e4cd 100644
--- a/purpur-server/minecraft-patches/features/0001-Ridables.patch
+++ b/purpur-server/minecraft-patches/features/0001-Ridables.patch
@@ -18,10 +18,10 @@ index aa87e93ade4c25a575e7861fef45b70c3e4e3aeb..c92ffd8b2fe4945ccd552eb54154b7be
              public boolean isClientAuthoritative() {
                  return false;
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index cb3b20e3dfc69da4ea371b0068d001312065a4b5..7ffcd79602a39d7168e049a058d940244c1f3d28 100644
+index 58ea6480a5c606ea1d2ffa65b4919ed105001d54..abd97aa02155cd4639bd55acb4fbb151dffbb05e 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1792,6 +1792,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1800,6 +1800,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              serverLevel.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
              serverLevel.updateLagCompensationTick(); // Paper - lag compensation
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = serverLevel.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch
index 70b7e5c19..43b34931a 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch
@@ -17,7 +17,7 @@
      // Paper start - improve tick loop
      public final ca.spottedleaf.moonrise.common.time.TickData tickTimes1s  = new ca.spottedleaf.moonrise.common.time.TickData(java.util.concurrent.TimeUnit.SECONDS.toNanos(1L));
      public final ca.spottedleaf.moonrise.common.time.TickData tickTimes5s  = new ca.spottedleaf.moonrise.common.time.TickData(java.util.concurrent.TimeUnit.SECONDS.toNanos(5L));
-@@ -340,6 +_,7 @@
+@@ -348,6 +_,7 @@
          final long now = System.nanoTime();
          final long interval = this.tickRateManager().nanosecondsPerTick();
          return new double[] {
@@ -25,7 +25,7 @@
              getTPS(this.tickTimes1m, now, interval),
              getTPS(this.tickTimes5m, now, interval),
              getTPS(this.tickTimes15m, now, interval)
-@@ -980,6 +_,15 @@
+@@ -988,6 +_,15 @@
  
          LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
@@ -41,7 +41,7 @@
          // CraftBukkit start
          if (this.server != null) {
              this.server.spark.disable(); // Paper - spark
-@@ -1078,6 +_,8 @@
+@@ -1086,6 +_,8 @@
          this.safeShutdown(waitForShutdown, false);
      }
      public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
@@ -50,7 +50,7 @@
          this.isRestarting = isRestarting;
          this.hasLoggedStop = true; // Paper - Debugging
          if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
-@@ -1261,6 +_,16 @@
+@@ -1269,6 +_,16 @@
              }
              // Paper end - Add onboarding message for initial server start
  
@@ -67,7 +67,7 @@
              while (this.running) {
                  final long tickStart = System.nanoTime(); // Paper - improve tick loop
                  long l; // Paper - improve tick loop - diff on change, expect this to be tick interval
-@@ -1274,8 +_,10 @@
+@@ -1282,8 +_,10 @@
                      final long ticksBehind = Math.max(1L, this.tickSchedule.getPeriodsAhead(l, tickStart));
                      final long catchup = (long)Math.max(
                          1,
@@ -79,7 +79,7 @@
  
                      // adjust ticksBehind so that it is not greater-than catchup
                      if (ticksBehind > catchup) {
-@@ -1746,7 +_,7 @@
+@@ -1754,7 +_,7 @@
              long worldTime = level.getGameTime();
              final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
              for (Player entityhuman : level.players()) {
@@ -88,7 +88,7 @@
                      continue;
                  }
                  ServerPlayer entityplayer = (ServerPlayer) entityhuman;
-@@ -1918,7 +_,7 @@
+@@ -1926,7 +_,7 @@
  
      @DontObfuscate
      public String getServerModName() {