Update Paper

Author: Spottedleaf

folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch

@@ -9,10 +9,10 @@ add explicit block update suppression techniques, it's better
 than the server crashing.
 
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index 3cd535e108e797d4a0b3e776ad0c70d949335061..9f7fa145f7f6a765c668dc7754626a91bef4ce6a 100644
+index 18960e83871a0ec571f821ad50869604b2d3c543..8d02daa32b6888d9ac4581f05e89ef8fb5b94834 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
-@@ -2015,7 +2015,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -2014,7 +2014,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      public void updateNeighbourForOutputSignal(BlockPos pos, Block block) {
          for (Direction direction : Direction.Plane.HORIZONTAL) {
              BlockPos blockPos = pos.relative(direction);

folia-server/minecraft-patches/features/0004-Prevent-block-updates-in-non-loaded-or-non-owned-chu.patch

@@ -1461,26 +1461,26 @@ index f9300b9f8d15843dae8fd73ff066e4be99b60451..e07e5eced7e32d1c3a0ac14e8639c1f1
                      if (var3 instanceof ReportedException reportedException && reportedException.getCause() instanceof OutOfMemoryError) {
                          throw PacketUtils.makeReportedException(var3, this.packet, this.listener);
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 7a6dab62a76b70183441c44b654109fb759e2e72..97842c57f5d2ec4b9ea002695fafd614a10b806a 100644
+index 78367d9620912b11473f582022422f7c062ed67c..c01a09c616bf9981df445af363047906e13466b8 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1658,6 +1658,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1661,6 +1661,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // Folia start - region threading
      public void tickServer(long startTime, long scheduledEnd, long targetBuffer,
                             io.papermc.paper.threadedregions.TickRegions.TickRegionData region) {
 +        final ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle foliaProfiler = io.papermc.paper.threadedregions.TickRegionScheduler.getProfiler(); // Folia - profiler
          // Folia end - region threading
          org.spigotmc.WatchdogThread.tick(); // Spigot
          long nanos = startTime; // Folia - region threading
-@@ -1695,6 +1696,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1698,6 +1699,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
 
 +
          // Folia start - region threading
          region.world.getCurrentWorldData().updateTickData();
          BooleanSupplier hasTimeLeft = () -> {
-@@ -1706,22 +1708,33 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1709,22 +1711,33 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          new com.destroystokyo.paper.event.server.ServerTickStartEvent((int)region.getCurrentTick()).callEvent(); // Paper - Server Tick Events // Folia - region threading
          // Folia start - region threading
          if (region != null) {
@@ -1514,31 +1514,31 @@ index 7a6dab62a76b70183441c44b654109fb759e2e72..97842c57f5d2ec4b9ea002695fafd614
          }
          // Folia end - region threading
          //this.tickCount++; // Folia - region threading
-@@ -1741,6 +1754,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1744,6 +1757,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          profiler.push("save");
          final boolean fullSave = autosavePeriod > 0 && io.papermc.paper.threadedregions.RegionizedServer.getCurrentTick() % autosavePeriod == 0; // Folia - region threading
 +        foliaProfiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.AUTOSAVE); try { // Folia - profiler
          try {
              this.isSaving = true;
              if (playerSaveInterval > 0) {
-@@ -1754,6 +1768,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1757,6 +1771,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          } finally {
              this.isSaving = false;
          }
 +        } finally { foliaProfiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.AUTOSAVE); } // Folia - profiler
          profiler.pop();
          // Paper end - Incremental chunk and player saving
 
-@@ -1853,6 +1868,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1856,6 +1871,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // Folia - region threading - moved to regionised data
 
      protected void tickChildren(BooleanSupplier hasTimeLeft, io.papermc.paper.threadedregions.TickRegions.TickRegionData region) { // Folia - region threading
 +        final ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle profiler = io.papermc.paper.threadedregions.TickRegionScheduler.getProfiler(); // Folia - profiler
          final io.papermc.paper.threadedregions.RegionizedWorldData regionizedWorldData = io.papermc.paper.threadedregions.TickRegionScheduler.getCurrentRegionizedWorldData(); // Folia - regionised ticking
          ProfilerFiller profilerFiller = Profiler.get();
          //this.getPlayerList().getPlayers().forEach(serverPlayer1 -> serverPlayer1.connection.suspendFlushing()); // Folia - region threading
-@@ -1907,7 +1923,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1910,7 +1926,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              profilerFiller.push("tick");
 
              try {
@@ -1548,7 +1548,7 @@ index 7a6dab62a76b70183441c44b654109fb759e2e72..97842c57f5d2ec4b9ea002695fafd614
              } catch (Throwable var7) {
                  CrashReport crashReport = CrashReport.forThrowable(var7, "Exception ticking world");
                  serverLevel.fillReportDetails(crashReport);
-@@ -1921,7 +1939,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1924,7 +1942,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          //this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked // Folia - region threading
 
          profilerFiller.popPush("connection");
@@ -1737,7 +1737,7 @@ index 79bc7b4f112f390592694e2d5c358f1c98e6c310..7400be75c5dae2b24cc327d23b703bf6
 
          profiler.pop();
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 1f23ca975a870b45b600e782d4779ab4bfb3af49..833e004937871e5a9ba2a5a41f4c7f46f6010181 100644
+index efd303538bdc38c5497703d8d0bdeb2ccf0e0fd0..3471200d54b938ef82f142efc2fcb096d72ec7b4 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -763,6 +763,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -1748,7 +1748,7 @@ index 1f23ca975a870b45b600e782d4779ab4bfb3af49..833e004937871e5a9ba2a5a41f4c7f46
          ProfilerFiller profilerFiller = Profiler.get();
          regionizedWorldData.setHandlingTick(true); // Folia - regionised ticking
          TickRateManager tickRateManager = this.tickRateManager();
-@@ -786,22 +787,32 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -800,22 +801,32 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          if (!this.isDebug() && runsNormally) {
              long l = regionizedWorldData.getRedstoneGameTime(); // Folia - region threading
              profilerFiller.push("blockTicks");
@@ -1781,15 +1781,15 @@ index 1f23ca975a870b45b600e782d4779ab4bfb3af49..833e004937871e5a9ba2a5a41f4c7f46
          }
 
          regionizedWorldData.setHandlingTick(false); // Folia - regionised ticking
-@@ -818,6 +829,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -832,6 +843,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          if (this.emptyTime < 300) {
              profilerFiller.push("entities");
              if (this.dragonFight != null && runsNormally) {
 +                profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.DRAGON_FIGHT_TICK); try { // Folia - profiler
                  if (ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this, this.dragonFight.origin)) { // Folia - region threading
                  profilerFiller.push("dragonFight");
                  this.dragonFight.tick();
-@@ -830,9 +842,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -844,9 +856,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
                              null
                      );
                  } // Folia end - region threading
@@ -1803,7 +1803,7 @@ index 1f23ca975a870b45b600e782d4779ab4bfb3af49..833e004937871e5a9ba2a5a41f4c7f46
              regionizedWorldData // Folia - regionised ticking
                  .forEachTickingEntity( // Folia - regionised ticking
                      entity -> {
-@@ -860,8 +876,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -874,8 +890,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
                          }
                      }
                  );
@@ -1815,7 +1815,7 @@ index 1f23ca975a870b45b600e782d4779ab4bfb3af49..833e004937871e5a9ba2a5a41f4c7f46
              profilerFiller.pop();
          }
 
-@@ -942,8 +961,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -956,8 +975,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      }
 
      public void tickCustomSpawners(boolean spawnEnemies) {
@@ -1827,7 +1827,7 @@ index 1f23ca975a870b45b600e782d4779ab4bfb3af49..833e004937871e5a9ba2a5a41f4c7f46
          }
      }
 
-@@ -1398,6 +1420,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1412,6 +1434,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          profilerFiller.push(() -> BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).toString());
          profilerFiller.incrementCounter("tickNonPassenger");
          final boolean isActive = io.papermc.paper.entity.activation.ActivationRange.checkIfActive(entity); // Paper - EAR 2
@@ -1840,15 +1840,15 @@ index 1f23ca975a870b45b600e782d4779ab4bfb3af49..833e004937871e5a9ba2a5a41f4c7f46
          if (isActive) { // Paper - EAR 2
          entity.tick();
          // Folia start - region threading
-@@ -1412,6 +1440,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1426,6 +1454,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          // Folia end - region threading
          } else {entity.inactiveTick();} // Paper - EAR 2
          profilerFiller.pop();
 +        } finally { profiler.stopTimer(timerId); } // Folia - profiler
 
          for (Entity entity1 : entity.getPassengers()) {
              this.tickPassenger(entity, entity1, isActive); // Paper - EAR 2
-@@ -1427,6 +1456,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1441,6 +1470,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          if (passengerEntity.isRemoved() || passengerEntity.getVehicle() != ridingEntity) {
              passengerEntity.stopRiding();
          } else if (passengerEntity instanceof Player || this.getCurrentWorldData().hasEntityTickingEntity(passengerEntity)) { // Folia - region threading
@@ -1861,7 +1861,7 @@ index 1f23ca975a870b45b600e782d4779ab4bfb3af49..833e004937871e5a9ba2a5a41f4c7f46
              passengerEntity.setOldPosAndRot();
              passengerEntity.tickCount++;
              passengerEntity.totalEntityAge++; // Paper - age-like counter for all entities
-@@ -1458,6 +1493,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1472,6 +1507,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              for (Entity entity : passengerEntity.getPassengers()) {
                  this.tickPassenger(passengerEntity, entity, isActive); // Paper - EAR 2
              }
@@ -1936,10 +1936,10 @@ index abccad13c2bb3a33e98ad8eb6d7f08c0ef021811..0590d5723854a03a59fe9471710802f4
          }
      }
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index 1a815a6e89fd2924f59c0fcad061d61cae29aca1..937f7f51e047d6f71ce89db0c8697ea558334bbc 100644
+index 8d02daa32b6888d9ac4581f05e89ef8fb5b94834..2c3d36a9d4bf361c516fe1fe6e29d225002b303c 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
-@@ -194,6 +194,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -193,6 +193,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      public final ca.spottedleaf.moonrise.patches.chunk_system.level.entity.EntityLookup moonrise$getEntityLookup() {
          return this.entityLookup;
      }
@@ -1949,7 +1949,7 @@ index 1a815a6e89fd2924f59c0fcad061d61cae29aca1..937f7f51e047d6f71ce89db0c8697ea5
 
      @Override
      public final void moonrise$setEntityLookup(final ca.spottedleaf.moonrise.patches.chunk_system.level.entity.EntityLookup entityLookup) {
-@@ -884,6 +887,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -883,6 +886,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
          this.damageSources = new DamageSources(registryAccess);
          this.entityLookup = new ca.spottedleaf.moonrise.patches.chunk_system.level.entity.dfl.DefaultEntityLookup(this); // Paper - rewrite chunk system
          this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new io.papermc.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : io.papermc.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
@@ -1959,7 +1959,7 @@ index 1a815a6e89fd2924f59c0fcad061d61cae29aca1..937f7f51e047d6f71ce89db0c8697ea5
      }
 
      // Paper start - Cancel hit for vanished players
-@@ -1433,11 +1439,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -1432,11 +1438,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      }
 
      public void tickBlockEntities() {
@@ -1975,7 +1975,7 @@ index 1a815a6e89fd2924f59c0fcad061d61cae29aca1..937f7f51e047d6f71ce89db0c8697ea5
          // Spigot start
          boolean runsNormally = this.tickRateManager().runsNormally();
 
-@@ -1459,6 +1469,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -1458,6 +1468,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
              }
          }
          blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075 // Folia - regionised ticking