Update upstream

Author: PureGero

gradle.properties

@@ -3,7 +3,7 @@ version=1.21.11-R0.1-SNAPSHOT
 mcVersion=1.21.11
 apiVersion=1.21.11
 
-purpurRef=f6242c0a304bee6b87df1bdc62e18d6a38ed3452
+purpurRef=a91710642835466d3b07c1ab87bbdc8a75fd5a18
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

shreddedpaper-server/minecraft-patches/sources/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java.patch

@@ -160,7 +160,7 @@
          if (!TickThread.isTickThread()) {
              // These will be handled on the next ServerChunkCache$MainThreadExecutor#pollTask, as it runs the distance manager update
              // which will invoke processTicketUpdates
-@@ -1143,94 +_,110 @@
+@@ -1143,97 +_,116 @@
 
      private void removeChunkHolder(final NewChunkHolder holder) {
          holder.onUnload();
@@ -230,8 +230,17 @@
          // We do need to process updates here so that any addTicket that is synchronised before this call does not go missed.
          this.processTicketUpdates();
 
--        final int toUnloadCount = Math.max(50, (int)(unloadCountTentative * 0.05));
-+        final int toUnloadCount = 50; // Math.max(50, (int)(unloadCountTentative * 0.05)); // ShreddedPaper - use our own unload queue
+-        final int toUnloadCount = Math.max(
+-            PlatformHooks.get().configMinChunkUnloadCount(this.world),
+-            (int)Math.round(unloadCountTentative * Math.clamp(PlatformHooks.get().configMinChunkUnloadFraction(this.world), 0.0, 1.0))
+-        );
++        // ShreddedPaper start - use our own unload queue
++        // final int toUnloadCount = Math.max(
++        //     PlatformHooks.get().configMinChunkUnloadCount(this.world),
++        //     (int)Math.round(unloadCountTentative * Math.clamp(PlatformHooks.get().configMinChunkUnloadFraction(this.world), 0.0, 1.0))
++        // );
++        final int toUnloadCount = 50;
++        // ShreddedPaper end - use our own unload queue
          int processedCount = 0;
 
 -        for (final ChunkUnloadQueue.SectionToUnload sectionRef : unloadSectionsForRegion) {
@@ -334,7 +343,7 @@
 
                      // run stage 1
                      for (int i = 0, len = stage1.size(); i < len; ++i) {
-@@ -1295,10 +_,12 @@
+@@ -1298,10 +_,12 @@
 
              processedCount += stage1.size();
 
@@ -351,7 +360,7 @@
      }
 
      public enum TicketOperationType {
-@@ -1515,7 +_,7 @@
+@@ -1518,7 +_,7 @@
      public JsonObject getDebugJson() {
          final JsonObject ret = new JsonObject();
 

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

@@ -8,4 +8,4 @@
 +    private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER! REPORT TO SHREDDEDPAPER INSTEAD!", ""); // Purpur - Rebrand // ShreddedPaper
 
      public CrashReport(String title, Throwable exception) {
-         io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(exception); // Paper
+         this.title = title;

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

@@ -84,7 +84,7 @@
              }
 
              this.waitUntilNextTick();
-@@ -1627,7 +_,9 @@
+@@ -1622,7 +_,9 @@
                      this.autoSave();
                  }
 
@@ -94,7 +94,7 @@
                  // Paper start - avoid issues with certain tasks not processing during sleep
                  Runnable task;
                  while ((task = this.processQueue.poll()) != null) {
-@@ -1635,7 +_,7 @@
+@@ -1630,7 +_,7 @@
                  }
                  for (final ServerLevel level : this.levels.values()) {
                      // process unloads
@@ -103,7 +103,7 @@
                  }
                  // Paper end - avoid issues with certain tasks not processing during sleep
                  this.server.spark.executeMainThreadTasks(); // Paper - spark
-@@ -1794,16 +_,20 @@
+@@ -1789,16 +_,20 @@
      protected void tickChildren(BooleanSupplier hasTimeLeft) {
          ProfilerFiller profilerFiller = Profiler.get();
          this.getPlayerList().getPlayers().forEach(serverPlayer1 -> serverPlayer1.connection.suspendFlushing());
@@ -132,7 +132,7 @@
          // Paper end - optimise Folia entity scheduler
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.ADVENTURE_CLICK_MANAGER.handleQueue(this.tickCount); // Paper
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.DIALOG_CLICK_MANAGER.handleQueue(this.tickCount); // Paper
-@@ -1839,7 +_,23 @@
+@@ -1834,7 +_,23 @@
              }
          }
 
@@ -156,7 +156,7 @@
          for (ServerLevel serverLevel : this.getAllLevels()) {
              serverLevel.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
              serverLevel.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
-@@ -1858,7 +_,9 @@
+@@ -1853,7 +_,9 @@
              profilerFiller.push("tick");
 
              try {
@@ -167,7 +167,7 @@
              } catch (Throwable var7) {
                  CrashReport crashReport = CrashReport.forThrowable(var7, "Exception ticking world");
                  serverLevel.fillReportDetails(crashReport);
-@@ -1867,12 +_,20 @@
+@@ -1862,12 +_,20 @@
 
              profilerFiller.pop();
              profilerFiller.pop();
@@ -191,7 +191,7 @@
          profilerFiller.popPush("players");
          this.playerList.tick();
          profilerFiller.popPush("debugSubscribers");
-@@ -1892,6 +_,7 @@
+@@ -1887,6 +_,7 @@
 
          for (ServerPlayer serverPlayer : this.playerList.getPlayers()) {
              serverPlayer.connection.chunkSender.sendNextChunks(serverPlayer);