Sync Moonrise

See Tuinity/Moonrise@b2968ce#diff-4ac4a0af7a908348ccdb1ae58ba7819ec41e5ba3f599e058f7060aa06331cacd
We already perform a watchdog shutdown on Paper so these changes
are just to keep the codebases in-sync.

Author: Spottedleaf

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

@@ -354,18 +354,18 @@ index 0000000000000000000000000000000000000000..ae2bb9a73106febfe5f0d090abd4252b
 +    }
 +}
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 9d105729b5828bb6c601641b968f0c7cb10d45a0..2d80bf1d923c11bf0eb786655894f2d440bdd460 100644
+index a2d93c95ed32a930383e65b7522a795e61d6a3f1..ec0f91e65e87340eb319a2392bcedb7531a4da29 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -808,6 +808,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -815,6 +815,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
                  profilerFiller.pop();
              }
 
 +            io.papermc.paper.entity.activation.ActivationRange.activateEntities(this); // Paper - EAR
              this.entityTickList
                  .forEach(
                      entity -> {
-@@ -1302,12 +1303,15 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1309,12 +1310,15 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          entity.totalEntityAge++; // Paper - age-like counter for all entities
          profilerFiller.push(() -> BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).toString());
          profilerFiller.incrementCounter("tickNonPassenger");
@@ -382,7 +382,7 @@ index 9d105729b5828bb6c601641b968f0c7cb10d45a0..2d80bf1d923c11bf0eb786655894f2d4
          }
          // Paper start - log detailed entity tick information
          } finally {
-@@ -1318,7 +1322,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1325,7 +1329,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          // Paper end - log detailed entity tick information
      }
 
@@ -391,7 +391,7 @@ index 9d105729b5828bb6c601641b968f0c7cb10d45a0..2d80bf1d923c11bf0eb786655894f2d4
          if (passengerEntity.isRemoved() || passengerEntity.getVehicle() != ridingEntity) {
              passengerEntity.stopRiding();
          } else if (passengerEntity instanceof Player || this.entityTickList.contains(passengerEntity)) {
-@@ -1328,12 +1332,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1335,12 +1339,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              ProfilerFiller profilerFiller = Profiler.get();
              profilerFiller.push(() -> BuiltInRegistries.ENTITY_TYPE.getKey(passengerEntity.getType()).toString());
              profilerFiller.incrementCounter("tickPassenger");

paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch

@@ -2326,7 +2326,7 @@ index 0000000000000000000000000000000000000000..298076a0db4e6ee6e4775ac43bf749d9
 +    }
 +}
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 2d80bf1d923c11bf0eb786655894f2d440bdd460..6e42222e63160f6b855006d24f37dbe7559efc0f 100644
+index ec0f91e65e87340eb319a2392bcedb7531a4da29..71a4db2e21826dbd0cdc2b1505ec3d9a973dca58 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -221,6 +221,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -2337,7 +2337,7 @@ index 2d80bf1d923c11bf0eb786655894f2d440bdd460..6e42222e63160f6b855006d24f37dbe7
 
      @Override
      public @Nullable LevelChunk getChunkIfLoaded(int x, int z) {
-@@ -2663,6 +2664,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2670,6 +2671,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          return this.debugSynchronizers;
      }
 

paper-server/patches/features/0016-Add-Alternate-Current-redstone-implementation.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Incremental chunk and player saving
 
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 2bb59acb87f0a230b7cf4870477fc65bea18f3e3..6954ed9560752eb67a332ba4a121420ed09af4c4 100644
+index e4f1ef626815412b768378ce9f6e682819e5b1b0..af121eae82d45aaa600bdc5b30f810cc63777c40 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -922,7 +922,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -938,7 +938,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          boolean var4;
          try {
              this.isSaving = true;
@@ -17,7 +17,7 @@ index 2bb59acb87f0a230b7cf4870477fc65bea18f3e3..6954ed9560752eb67a332ba4a121420e
              var4 = this.saveAllChunks(suppressLogs, flush, force);
          } finally {
              this.isSaving = false;
-@@ -1582,9 +1582,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1598,9 +1598,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
 
          this.ticksUntilAutosave--;
@@ -50,10 +50,10 @@ index 2bb59acb87f0a230b7cf4870477fc65bea18f3e3..6954ed9560752eb67a332ba4a121420e
          ProfilerFiller profilerFiller = Profiler.get();
          this.server.spark.executeMainThreadTasks(); // Paper - spark
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 6e42222e63160f6b855006d24f37dbe7559efc0f..701fc4018f98c22803dadf65ba91f7a6395167fb 100644
+index 71a4db2e21826dbd0cdc2b1505ec3d9a973dca58..f6252995a648014a0608621b3fe83b06404c38f4 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -1371,6 +1371,26 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1378,6 +1378,26 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          return !(entity instanceof Player player && (this.server.isUnderSpawnProtection(this, pos, player) || !this.getWorldBorder().isWithinBounds(pos)));
      }
 

paper-server/patches/features/0021-Incremental-chunk-and-player-saving.patch

@@ -20,10 +20,10 @@ index a2fbc13105673e926cbaed69221826ebd392140f..a42938e1abd371dba6806e65552fde71
 
      @Override
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 6954ed9560752eb67a332ba4a121420ed09af4c4..177ab119e3bc164f98dea6ea046d67ddc6b7e1ab 100644
+index af121eae82d45aaa600bdc5b30f810cc63777c40..d99b8868c18303bd60761ba9148c221c91917ce5 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1696,33 +1696,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1712,33 +1712,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
 

paper-server/patches/features/0026-Optimise-EntityScheduler-ticking.patch

@@ -48,10 +48,10 @@ index 0000000000000000000000000000000000000000..24a2090e068ad3c0d08705050944abdf
 +    }
 +}
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 177ab119e3bc164f98dea6ea046d67ddc6b7e1ab..375d09fe292814ec65439e5c2c271b2a9c5f6a14 100644
+index d99b8868c18303bd60761ba9148c221c91917ce5..2598b6a442f414d10180faea4847ddd4650a6804 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1751,6 +1751,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1767,6 +1767,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              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
              serverLevel.updateLagCompensationTick(); // Paper - lag compensation

paper-server/patches/features/0029-Optimize-Hoppers.patch

@@ -143,10 +143,10 @@ index fdd164cd45a26c7ef25f1153ab8985ba50c01b14..8578d1f78ddd1bb75f3230f04bfaa35a
 
      private ClientboundLevelChunkWithLightPacket(RegistryFriendlyByteBuf buffer) {
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 701fc4018f98c22803dadf65ba91f7a6395167fb..ea8f29a03681fd17c6ac6a1e575e6b1d7f281c47 100644
+index f6252995a648014a0608621b3fe83b06404c38f4..84df4f20c5fc9d557ca93193437ed7cb2e2317b5 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -602,7 +602,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -609,7 +609,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          org.bukkit.generator.BiomeProvider biomeProvider // CraftBukkit
      ) {
          // CraftBukkit start