Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d10c3129 Update inactive tick handler (#13621)
PaperMC/Paper@6103cc7f Expand mobs-can-always-pick-up-loot.zombies for husk (#13624)
PaperMC/Paper@255c25e2 fix "do not prematurely disconnect players on stop" (#13625)
PaperMC/Paper@e17a767f Logging fixes around plugin disable and shutdown; logging cleanup (#13622)
PaperMC/Paper@1f1406f1 Fix collision inconsistency with Vanilla
PaperMC/Paper@6f71be80 Sync Moonrise

purpur-server/minecraft-patches/sources/net/minecraft/CrashReport.java.patch

@@ -7,8 +7,8 @@
 +    private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER! REPORT TO PURPUR INSTEAD!", ""); // Purpur - Rebrand
  
      public CrashReport(String title, Throwable exception) {
-         io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(exception); // Paper
-@@ -130,7 +_,7 @@
+         this.title = title;
+@@ -129,7 +_,7 @@
      }
  
      public String getFriendlyReport(ReportType type) {
@@ -17,7 +17,7 @@
      }
  
      public @Nullable Path getSaveFile() {
-@@ -160,7 +_,7 @@
+@@ -159,7 +_,7 @@
      }
  
      public boolean saveToFile(Path path, ReportType type) {

purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch

@@ -41,7 +41,7 @@
          // CraftBukkit start
          if (this.server != null) {
              this.server.spark.disable(); // Paper - spark
-@@ -1112,6 +_,8 @@
+@@ -1107,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
-@@ -1289,11 +_,21 @@
+@@ -1284,11 +_,21 @@
              }
              // Paper end - Add onboarding message for initial server start
              // Paper start - Improve outdated version checking
@@ -73,7 +73,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
-@@ -1307,8 +_,10 @@
+@@ -1302,8 +_,10 @@
                      final long ticksBehind = Math.max(1L, this.tickSchedule.getPeriodsAhead(l, tickStart));
                      final long catchup = (long)Math.max(
                          1,
@@ -85,7 +85,7 @@
  
                      // adjust ticksBehind so that it is not greater-than catchup
                      if (ticksBehind > catchup) {
-@@ -1790,7 +_,7 @@
+@@ -1785,7 +_,7 @@
              long worldTime = level.getGameTime();
              final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
              for (Player entityhuman : level.players()) {
@@ -94,7 +94,7 @@
                      continue;
                  }
                  ServerPlayer entityplayer = (ServerPlayer) entityhuman;
-@@ -1957,7 +_,7 @@
+@@ -1952,7 +_,7 @@
  
      @DontObfuscate
      public String getServerModName() {