Update Paper

gradle.properties

@@ -3,6 +3,6 @@ version=1.21-R0.1-SNAPSHOT
 
 mcVersion=1.21
 org.gradle.jvmargs=-Xmx2G
-paperRef=2fa5e0e0df6c2fa4ccb7ab80710d839dd8e0c5ce
+paperRef=0e02aa5b8e973c1a1deb15eaef6389212cf41eb3
 preVersion=true
 updatingMinecraft=true

patches/server/0001-Build-changes.patch

@@ -164,10 +164,10 @@ index 790bad0494454ca12ee152e3de6da3da634d9b20..c060857cb0551fff8f5033553b887f3a
      private static final String BUILD_DEV = "DEV";
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 330bee331335454a61cf8350a6654217c8124445..7a605d767d4f8e13d26071b9965a7724677e57d8 100644
+index 54e581db732c3a104142a2bbc228ecbe16aec0fc..c3b5b132848b8c5af45b171ba3b4f01109b5f724 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1248,7 +1248,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1249,7 +1249,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  LOGGER.info("*************************************************************************************");
                  LOGGER.info("This is the first time you're starting this server.");
                  LOGGER.info("It's recommended you read our 'Getting Started' documentation for guidance.");
@@ -176,7 +176,7 @@ index 330bee331335454a61cf8350a6654217c8124445..7a605d767d4f8e13d26071b9965a7724
                  LOGGER.info("*************************************************************************************");
              }
              // Paper end - Add onboarding message for initial server start
-@@ -1932,7 +1932,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1934,7 +1934,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -215,7 +215,7 @@ index 759062d219ff490a3cb19e710c4d18e3e08288e0..3952428c02fe87477f4139f4fa983815
  
          javax.swing.JLabel jLabel = new javax.swing.JLabel("If you need help setting up your server you can visit:");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 6e1f92b45504cef0c4dcbbebf3df339ef4cad0a1..459f47244bdfeab63b5f16d780b0291d36310de8 100644
+index 1acc0a579804dee7bb3d0f755c24240413ed7540..e863c947d6d8d4c9af113fd6472b7ddbe1fdd26e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -273,7 +273,7 @@ public class Main {
@@ -241,10 +241,10 @@ index 774556a62eb240da42e84db4502e2ed43495be17..fdef98a7796d84c7b0ee61241859e10c
  
          if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index e5e41dc2d4f7a8c3fea704212507ca0b951664db..6f65c34dab1f031b4015ff3bb9ccdad28e679d38 100644
+index f947b542b21189ab8324d54d965364aa283d7cb7..36f4fd963d77ea66371799fec09af098c2542eb4 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -83,14 +83,14 @@ public class WatchdogThread extends Thread
+@@ -155,14 +155,14 @@ public class WatchdogThread extends Thread
                  if (isLongTimeout) {
                  // Paper end
                  log.log( Level.SEVERE, "------------------------------" );
@@ -262,7 +262,7 @@ index e5e41dc2d4f7a8c3fea704212507ca0b951664db..6f65c34dab1f031b4015ff3bb9ccdad2
                  //
                  if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
                  {
-@@ -112,12 +112,12 @@ public class WatchdogThread extends Thread
+@@ -184,12 +184,12 @@ public class WatchdogThread extends Thread
                  // Paper end
                  } else
                  {
@@ -275,9 +275,9 @@ index e5e41dc2d4f7a8c3fea704212507ca0b951664db..6f65c34dab1f031b4015ff3bb9ccdad2
 -                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
 +                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Leaves!):" ); // Paper // Leaevs
                  ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - rewrite chunk system
+                 this.dumpTickingInfo(); // Paper - log detailed tick information
                  WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
-                 log.log( Level.SEVERE, "------------------------------" );
+@@ -205,7 +205,7 @@ public class WatchdogThread extends Thread
-@@ -132,7 +132,7 @@ public class WatchdogThread extends Thread
                      WatchdogThread.dumpThread( thread, log );
                  }
                  } else {

patches/server/0003-Delete-Timings.patch

@@ -801,11 +801,11 @@ index 097500a59336db1bbfffcd1aa4cff7a8586e46ec..35b00c139864dd7925d46a2d6a317d7e
  
      @Override
 diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
-index d0d36a57ec4896bcb74970f8fb24d8f3e17db133..f7197f1347251a37dd0f6d9ffa2f09bc3a4e1233 100644
+index e2c24813f59c2fd075c740ac1842a38f20ed8554..1f7f68aad97ee73763c042837f239bdc7167db55 100644
 --- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java
 +++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
-@@ -31,8 +31,7 @@ public class PacketUtils {
+@@ -51,8 +51,7 @@ public class PacketUtils {
-             engine.executeIfPossible(() -> {
+                 try { // Paper - detailed watchdog information
                  if (listener instanceof ServerCommonPacketListenerImpl serverCommonPacketListener && serverCommonPacketListener.processedDisconnect) return; // CraftBukkit - Don't handle sync packets for kicked players
                  if (listener.shouldHandleMessage(packet)) {
 -                    co.aikar.timings.Timing timing = co.aikar.timings.MinecraftTimings.getPacketTiming(packet); // Paper - timings
@@ -815,7 +815,7 @@ index d0d36a57ec4896bcb74970f8fb24d8f3e17db133..f7197f1347251a37dd0f6d9ffa2f09bc
                      } catch (Exception exception) {
                          if (exception instanceof ReportedException) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7a605d767d4f8e13d26071b9965a7724677e57d8..3a37a083556a722ea6fbc75adf32b36e1b66bcc4 100644
+index c3b5b132848b8c5af45b171ba3b4f01109b5f724..197e9e806f8f20b01c3ee21d339297ae45d344ea 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,9 +3,6 @@ package net.minecraft.server;
@@ -837,7 +837,7 @@ index 7a605d767d4f8e13d26071b9965a7724677e57d8..3a37a083556a722ea6fbc75adf32b36e
  public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements ServerInfo, ChunkIOErrorReporter, CommandSource, AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer { // Paper - rewrite chunk system
  
      private static MinecraftServer SERVER; // Paper
-@@ -1044,7 +1039,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1045,7 +1040,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
@@ -845,7 +845,7 @@ index 7a605d767d4f8e13d26071b9965a7724677e57d8..3a37a083556a722ea6fbc75adf32b36e
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
-@@ -1584,15 +1578,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1585,15 +1579,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -863,7 +863,7 @@ index 7a605d767d4f8e13d26071b9965a7724677e57d8..3a37a083556a722ea6fbc75adf32b36e
          // Paper end
          new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper - Server Tick Events
  
-@@ -1617,9 +1610,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1618,9 +1611,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          io.papermc.paper.util.CachedLists.reset(); // Paper
          // Paper start - move executeAll() into full server tick timing
@@ -874,7 +874,7 @@ index 7a605d767d4f8e13d26071b9965a7724677e57d8..3a37a083556a722ea6fbc75adf32b36e
          // Paper end
          // Paper start - Server Tick Events
          long endTime = System.nanoTime();
-@@ -1642,7 +1633,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1643,7 +1634,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.logTickMethodTime(i);
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -882,7 +882,7 @@ index 7a605d767d4f8e13d26071b9965a7724677e57d8..3a37a083556a722ea6fbc75adf32b36e
      }
  
      private void logTickMethodTime(long tickStartTime) {
-@@ -1713,9 +1703,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1714,9 +1704,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.getPlayerList().getPlayers().forEach((entityplayer) -> {
              entityplayer.connection.suspendFlushing();
          });
@@ -892,7 +892,7 @@ index 7a605d767d4f8e13d26071b9965a7724677e57d8..3a37a083556a722ea6fbc75adf32b36e
          // Paper start - Folia scheduler API
          ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
          getAllLevels().forEach(level -> {
-@@ -1732,21 +1720,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1733,21 +1721,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end - Folia scheduler API
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
          this.profiler.push("commandFunctions");
@@ -914,7 +914,7 @@ index 7a605d767d4f8e13d26071b9965a7724677e57d8..3a37a083556a722ea6fbc75adf32b36e
          // Send time updates to everyone, it will get the right time from the world the player is in.
          // Paper start - Perf: Optimize time updates
          for (final ServerLevel level : this.getAllLevels()) {
-@@ -1766,7 +1749,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1767,7 +1750,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
          // Paper end - Perf: Optimize time updates
@@ -922,7 +922,7 @@ index 7a605d767d4f8e13d26071b9965a7724677e57d8..3a37a083556a722ea6fbc75adf32b36e
  
          this.isIteratingOverLevels = true; // Paper - Throw exception on world create while being ticked
          Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; move down
-@@ -1792,9 +1774,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1794,9 +1776,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.profiler.push("tick");
  
              try {
@@ -932,7 +932,7 @@ index 7a605d767d4f8e13d26071b9965a7724677e57d8..3a37a083556a722ea6fbc75adf32b36e
              } catch (Throwable throwable) {
                  CrashReport crashreport = CrashReport.forThrowable(throwable, "Exception ticking world");
  
-@@ -1809,24 +1789,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1811,24 +1791,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
          this.profiler.popPush("connection");
@@ -1008,7 +1008,7 @@ index 4214ed228125c6ba36ef2c763f842a54f33446fc..29d61b407762504dffc26f3048a17327
          // Paper start
          if (waitableArray[0] != null) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c96740a82eac9101f74edeb44edf4b64d1d633e0..85b76c5da9eea5bae0dd55f5b7ac1eb1a0211944 100644
+index 6df79aab2f0a75bbe347dc92e9ed5d62ceec7983..61cc6f42be6115f3b634b57d6fb1ee9f7a2a8ef1 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1,6 +1,5 @@
@@ -1018,7 +1018,7 @@ index c96740a82eac9101f74edeb44edf4b64d1d633e0..85b76c5da9eea5bae0dd55f5b7ac1eb1
  import com.google.common.collect.ImmutableList;
  import com.google.common.collect.ImmutableList.Builder;
  import com.google.common.collect.Iterables;
-@@ -957,7 +956,6 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -992,7 +991,6 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          List<ServerPlayer> list = Lists.newArrayList();
          List<ServerPlayer> list1 = this.level.players();
          ObjectIterator objectiterator = this.entityMap.values().iterator();
@@ -1026,7 +1026,7 @@ index c96740a82eac9101f74edeb44edf4b64d1d633e0..85b76c5da9eea5bae0dd55f5b7ac1eb1
  
          ChunkMap.TrackedEntity playerchunkmap_entitytracker;
  
-@@ -982,17 +980,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1017,17 +1015,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  playerchunkmap_entitytracker.serverEntity.sendChanges();
              }
          }
@@ -1132,7 +1132,7 @@ index 64ed296cfbe7e5d27286b8cee70454fd1d99ebb0..48991b885c7cad9c201887b222acad7d
              gameprofilerfiller.pop();
              gameprofilerfiller.pop();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e079f4db4e4738f60a6fdbdbf5e4d1baf593a62f..d6af1d0cd2829bc1e7e7c7a7a8014750c2bdac2b 100644
+index 9456047974db6de9ed38265d5d1ab822225c484f..2b1c86198a9d5c520bd7a9e325da15854214d933 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1,7 +1,6 @@
@@ -1143,7 +1143,7 @@ index e079f4db4e4738f60a6fdbdbf5e4d1baf593a62f..d6af1d0cd2829bc1e7e7c7a7a8014750
  import com.google.common.collect.Lists;
  import com.mojang.datafixers.DataFixer;
  import com.mojang.datafixers.util.Pair;
-@@ -682,7 +681,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -699,7 +698,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
          }
  
          gameprofilerfiller.popPush("tickPending");
@@ -1151,7 +1151,7 @@ index e079f4db4e4738f60a6fdbdbf5e4d1baf593a62f..d6af1d0cd2829bc1e7e7c7a7a8014750
          if (!this.isDebug() && flag) {
              j = this.getGameTime();
              gameprofilerfiller.push("blockTicks");
-@@ -691,24 +689,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -708,24 +706,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              this.fluidTicks.tick(j, paperConfig().environment.maxFluidTicks, this::tickFluid); // Paper - configurable max fluid ticks
              gameprofilerfiller.pop();
          }
@@ -1176,7 +1176,7 @@ index e079f4db4e4738f60a6fdbdbf5e4d1baf593a62f..d6af1d0cd2829bc1e7e7c7a7a8014750
          }
  
          this.handlingTick = false;
-@@ -721,7 +712,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -738,7 +729,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
  
          if (flag1 || this.emptyTime++ < 300) {
              gameprofilerfiller.push("entities");
@@ -1184,7 +1184,7 @@ index e079f4db4e4738f60a6fdbdbf5e4d1baf593a62f..d6af1d0cd2829bc1e7e7c7a7a8014750
              if (this.dragonFight != null && flag) {
                  gameprofilerfiller.push("dragonFight");
                  this.dragonFight.tick();
-@@ -729,7 +719,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -746,7 +736,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              }
  
              org.spigotmc.ActivationRange.activateEntities(this); // Spigot
@@ -1192,7 +1192,7 @@ index e079f4db4e4738f60a6fdbdbf5e4d1baf593a62f..d6af1d0cd2829bc1e7e7c7a7a8014750
              this.entityTickList.forEach((entity) -> {
                  if (!entity.isRemoved()) {
                      if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
-@@ -756,8 +745,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -773,8 +762,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
                      }
                  }
              });
@@ -1201,33 +1201,33 @@ index e079f4db4e4738f60a6fdbdbf5e4d1baf593a62f..d6af1d0cd2829bc1e7e7c7a7a8014750
              gameprofilerfiller.pop();
              this.tickBlockEntities();
          }
-@@ -870,7 +857,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -878,7 +865,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
          } // Paper - Option to disable ice and snow
  
          gameprofilerfiller.popPush("tickBlocks");
 -        timings.chunkTicksBlocks.startTiming(); // Paper
          if (randomTickSpeed > 0) {
-             // Paper start - optimize random block ticking
+             LevelChunkSection[] achunksection = chunk.getSections();
-             LevelChunkSection[] sections = chunk.getSections();
+ 
-@@ -904,7 +890,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -911,7 +897,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+             }
          }
-         // Paper end - optimise random block ticking
  
 -        timings.chunkTicksBlocks.stopTiming(); // Paper
          gameprofilerfiller.pop();
      }
  
-@@ -1206,9 +1191,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1223,9 +1208,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
-     }
+                 currentlyTickingEntity.lazySet(entity);
- 
+             }
-     public void tickNonPassenger(Entity entity) {
+             // Paper end - log detailed entity tick information
 -        ++TimingHistory.entityTicks; // Paper - timings
          // Spigot start
 -        co.aikar.timings.Timing timer; // Paper
          /*if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { // Paper - comment out - EAR 2, reimplement below
              entity.tickCount++;
              timer = entity.getType().inactiveTickTimer.startTiming(); try { // Paper - timings
-@@ -1217,11 +1200,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1234,11 +1217,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              return;
          }*/ // Paper - comment out EAR 2
          // Spigot end
@@ -1239,7 +1239,7 @@ index e079f4db4e4738f60a6fdbdbf5e4d1baf593a62f..d6af1d0cd2829bc1e7e7c7a7a8014750
          entity.setOldPosAndRot();
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
-@@ -1231,12 +1210,10 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1248,12 +1227,10 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
          });
          gameprofilerfiller.incrementCounter("tickNonPassenger");
          if (isActive) { // Paper - EAR 2
@@ -1252,7 +1252,7 @@ index e079f4db4e4738f60a6fdbdbf5e4d1baf593a62f..d6af1d0cd2829bc1e7e7c7a7a8014750
          Iterator iterator = entity.getPassengers().iterator();
  
          while (iterator.hasNext()) {
-@@ -1253,8 +1230,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1276,8 +1253,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              if (passenger instanceof Player || this.entityTickList.contains(passenger)) {
                  // Paper - EAR 2
                  final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(passenger);
@@ -1261,7 +1261,7 @@ index e079f4db4e4738f60a6fdbdbf5e4d1baf593a62f..d6af1d0cd2829bc1e7e7c7a7a8014750
                  // Paper end
                  passenger.setOldPosAndRot();
                  ++passenger.tickCount;
-@@ -1283,8 +1258,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1306,8 +1281,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
  
                      this.tickPassenger(passenger, entity2);
                  }
@@ -1270,7 +1270,7 @@ index e079f4db4e4738f60a6fdbdbf5e4d1baf593a62f..d6af1d0cd2829bc1e7e7c7a7a8014750
              }
          } else {
              passenger.stopRiding();
-@@ -1306,7 +1279,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1329,7 +1302,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
  
          if (!savingDisabled) {
              org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(this.getWorld())); // CraftBukkit
@@ -1278,7 +1278,7 @@ index e079f4db4e4738f60a6fdbdbf5e4d1baf593a62f..d6af1d0cd2829bc1e7e7c7a7a8014750
              if (progressListener != null) {
                  progressListener.progressStartNoAbort(Component.translatable("menu.savingLevel"));
              }
-@@ -1316,12 +1288,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1339,12 +1311,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
                  progressListener.progressStage(Component.translatable("menu.savingChunks"));
              }
  
@@ -1343,7 +1343,7 @@ index cb61462d4691a055a4b25f7b953609d8a154fdfe..b2b97c4c61ea5b6f7ec199fabbd1bd1c
          return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c4b10ce2fd9f1e346aa9240e354b0583b90d2bdc..26b0ea6c699fc057395254e8f585c35946bbc7f3 100644
+index 4c4050fe8f3b788481350caeb2077fa91be12060..428b42c2ac49cce7d4d99abaf6518c771d19117e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -157,7 +157,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -1430,10 +1430,10 @@ index 85b4b24361e785acf75571ff98f924c00ae80748..1f3e0392f88a7cb3fb5c0767cdd1b4bc
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 0d202ce8eb88bfdb8ca3306593d758fa483d8612..41acb79ec31f6f53589d698d1d4547485f0adc71 100644
+index c1f392cd7928a142192c87cf46ef2a4fc2495562..6bda11e309ec1216f2d5c4fb4eafa8d8ff897192 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -172,7 +172,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -173,7 +173,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      // Paper end - add paper world config
  
      public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
@@ -1441,7 +1441,7 @@ index 0d202ce8eb88bfdb8ca3306593d758fa483d8612..41acb79ec31f6f53589d698d1d454748
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
      private org.spigotmc.TickLimiter tileLimiter;
-@@ -342,7 +341,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -719,7 +718,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
              public void onBorderSetDamageSafeZOne(WorldBorder border, double safeZoneRadius) {}
          });
          // CraftBukkit end
@@ -1449,7 +1449,7 @@ index 0d202ce8eb88bfdb8ca3306593d758fa483d8612..41acb79ec31f6f53589d698d1d454748
          this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime);
          this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
          this.entityLookup = new ca.spottedleaf.moonrise.patches.chunk_system.level.entity.dfl.DefaultEntityLookup(this); // Paper - rewrite chunk system
-@@ -944,15 +942,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -1325,15 +1323,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("blockEntities");
@@ -1465,7 +1465,7 @@ index 0d202ce8eb88bfdb8ca3306593d758fa483d8612..41acb79ec31f6f53589d698d1d454748
          // Spigot start
          // Iterator<TickingBlockEntity> iterator = this.blockEntityTickers.iterator();
          boolean flag = this.tickRateManager().runsNormally();
-@@ -983,9 +978,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -1364,9 +1359,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
          }
          this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075
  
@@ -1496,7 +1496,7 @@ index ed8032495af9ce9c23419224814b8d27e4a97c17..189a6bd4967aba72e12170e091dbb5b7
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 45704653310efe9cb755a644674b54b8722c2c84..0c0b149a6cdfaf1de81bfbb92477fbb5c4a8a4bb 100644
+index 2ff21c5a9f7bcecb57ffaaafecc1462ca5456e48..6126fcb1bd724870068db0c39505a466b18cc320 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -102,13 +102,6 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -1533,10 +1533,10 @@ index c0563260277f9f4bd9ff08993b2efb4bca9a0c60..d93125ea494cb977b1616cabc90e2e7a
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
      public CraftPersistentDataContainer persistentDataContainer;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index d388fbcbff63928f0e9140c02400a63ba8f19d9c..bfed0a72280631e6f20e6b5d493515c9b589db97 100644
+index db55e9cc3d42ba01f75f6697924baaeccb564b90..12ee7f3cef6cd41b23200bb53bb6fd2018039d49 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -628,7 +628,6 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -650,7 +650,6 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
              ((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel)this.level).moonrise$getChunkTaskScheduler().chunkHolderManager.getChunkHolder(this.locX, this.locZ).getEntityChunk().callEntitiesLoadEvent(); // Paper - rewrite chunk system
  
              if (this.needsDecoration) {
@@ -1544,7 +1544,7 @@ index d388fbcbff63928f0e9140c02400a63ba8f19d9c..bfed0a72280631e6f20e6b5d493515c9
                  this.needsDecoration = false;
                  java.util.Random random = new java.util.Random();
                  random.setSeed(this.level.getSeed());
-@@ -648,7 +647,6 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -670,7 +669,6 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
                      }
                  }
                  server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkPopulateEvent(bukkitChunk));
@@ -1552,7 +1552,7 @@ index d388fbcbff63928f0e9140c02400a63ba8f19d9c..bfed0a72280631e6f20e6b5d493515c9
              }
          }
      }
-@@ -988,7 +986,6 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -1010,7 +1008,6 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
                          ProfilerFiller gameprofilerfiller = LevelChunk.this.level.getProfiler();
  
                          gameprofilerfiller.push(this::getType);
@@ -1560,7 +1560,7 @@ index d388fbcbff63928f0e9140c02400a63ba8f19d9c..bfed0a72280631e6f20e6b5d493515c9
                          BlockState iblockdata = LevelChunk.this.getBlockState(blockposition);
  
                          if (this.blockEntity.getType().isValid(iblockdata)) {
-@@ -1014,9 +1011,6 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -1036,9 +1033,6 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
                          LevelChunk.this.removeBlockEntity(this.getPos());
                          // Paper end - Prevent block entity and entity crashes
                          // Spigot start

patches/server/0004-Leaves-Server-Utils.patch

@@ -31,7 +31,7 @@ index 46954db7ecd35ac4018fdf476df7c8020d7ce6c8..044c51ebb058fc36074fd178929e3279
      public PlayerAreaMap() {
          super();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 83f3ffdd8fa901b3de580d2359cdb5ead0d762cb..9729b3a7ce3027ff4eb02fcb908768d24f74a5f8 100644
+index be9976a994dd04cf53048567576dd3484facf625..d582615c0ca9f483f1da31e91e66b22129881d63 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -430,6 +430,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -42,7 +42,7 @@ index 83f3ffdd8fa901b3de580d2359cdb5ead0d762cb..9729b3a7ce3027ff4eb02fcb908768d2
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -2453,6 +2454,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2556,6 +2557,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  nbttagcompound.putBoolean("Paper.FreezeLock", true);
              }
              // Paper end
@@ -50,7 +50,7 @@ index 83f3ffdd8fa901b3de580d2359cdb5ead0d762cb..9729b3a7ce3027ff4eb02fcb908768d2
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2600,6 +2602,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2703,6 +2705,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  freezeLocked = nbt.getBoolean("Paper.FreezeLock");
              }
              // Paper end
@@ -62,7 +62,7 @@ index 83f3ffdd8fa901b3de580d2359cdb5ead0d762cb..9729b3a7ce3027ff4eb02fcb908768d2
  
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
-@@ -4821,4 +4828,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4988,4 +4995,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end - Expose entity id counter

patches/server/0007-Leaves-Protocol-Core.patch

@@ -47,10 +47,10 @@ index 1967c43ee3a12e63365cc40ee6565307e2fd73cf..6e376d0db5321d8e9b6e0b54617ffd17
  
          assert isValidPath(path);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3a37a083556a722ea6fbc75adf32b36e1b66bcc4..9d7f102b6128638cd478e21867ad9f276bad4f32 100644
+index 197e9e806f8f20b01c3ee21d339297ae45d344ea..785aa6eeb299eb70bbea64631c1c8262ed3cb4ad 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1798,6 +1798,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1800,6 +1800,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          this.profiler.popPush("server gui refresh");
  

patches/server/0008-Fix-trading-with-the-void.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix trading with the void
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d6af1d0cd2829bc1e7e7c7a7a8014750c2bdac2b..9ac697d12ec670e2f67d11d94a09de50c7bd0b9e 100644
+index 2b1c86198a9d5c520bd7a9e325da15854214d933..176d02ede3e0b727c3619a51af5c2d953ee18de9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2516,11 +2516,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2539,11 +2539,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              // Spigot end
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message

patches/server/0010-Fakeplayer-support.patch

@@ -34,10 +34,10 @@ index 35772110e9318df46a2729dbc0b5879b290011b7..f26989a44cdda9baabf337d573436c6c
          Set<CriterionTrigger.Listener<T>> set = (Set) playerAdvancements.criterionData.get(this); // Paper - fix AdvancementDataPlayer leak
          if (set != null && !set.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9d7f102b6128638cd478e21867ad9f276bad4f32..e91c1db3bcb9f9139d4082e3868d7bcb9a9b084e 100644
+index 785aa6eeb299eb70bbea64631c1c8262ed3cb4ad..778a8c8a88128107b7ccd9bb4a783c0b519da9b1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -744,6 +744,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -745,6 +745,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          // Paper end - Configurable player collision
  
@@ -46,7 +46,7 @@ index 9d7f102b6128638cd478e21867ad9f276bad4f32..e91c1db3bcb9f9139d4082e3868d7bcb
          this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
          if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
          io.papermc.paper.command.brigadier.PaperCommands.INSTANCE.setValid(); // Paper - reset invalid state for event fire below
-@@ -1039,6 +1041,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1040,6 +1042,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
@@ -71,10 +71,10 @@ index 9fabf9322acd663c4452b562494e74aa42eb19da..b5f18a0115b629930de84a9d086505ad
          AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
          boolean flag1 = advancementprogress.isDone();
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 85b76c5da9eea5bae0dd55f5b7ac1eb1a0211944..c6eeb3324fbf58eb7a6eb61aa7a8dfdc46bda4ae 100644
+index 61cc6f42be6115f3b634b57d6fb1ee9f7a2a8ef1..b729402e93f1b7847d7bd90af12e155030030bdd 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1187,6 +1187,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1301,6 +1301,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                      }
                  } else if (this.seenBy.remove(player.connection)) {
                      this.serverEntity.removePairing(player);
@@ -89,7 +89,7 @@ index 85b76c5da9eea5bae0dd55f5b7ac1eb1a0211944..c6eeb3324fbf58eb7a6eb61aa7a8dfdc
  
              }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9ac697d12ec670e2f67d11d94a09de50c7bd0b9e..81ebb247a8d5c5cd77a3d4ce729146c9fbfa3668 100644
+index 176d02ede3e0b727c3619a51af5c2d953ee18de9..782b831f62cd2304fd70b22d468d9f990655ac72 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -228,6 +228,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -100,7 +100,7 @@ index 9ac697d12ec670e2f67d11d94a09de50c7bd0b9e..81ebb247a8d5c5cd77a3d4ce729146c9
  
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately
-@@ -605,6 +606,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -622,6 +623,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
          this.chunkTaskScheduler = new ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkTaskScheduler((ServerLevel)(Object)this, ca.spottedleaf.moonrise.common.util.MoonriseCommon.WORKER_POOL);
          // Paper end - rewrite chunk system
          this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
@@ -108,7 +108,7 @@ index 9ac697d12ec670e2f67d11d94a09de50c7bd0b9e..81ebb247a8d5c5cd77a3d4ce729146c9
      }
  
      // Paper start
-@@ -1977,6 +1979,12 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2000,6 +2002,12 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
          return this.players;
      }
  
@@ -121,7 +121,7 @@ index 9ac697d12ec670e2f67d11d94a09de50c7bd0b9e..81ebb247a8d5c5cd77a3d4ce729146c9
      @Override
      public void onBlockStateChange(BlockPos pos, BlockState oldBlock, BlockState newBlock) {
          Optional<Holder<PoiType>> optional = PoiTypes.forState(oldBlock);
-@@ -2448,6 +2456,11 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2471,6 +2479,11 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              // ServerLevel.this.getChunkSource().addEntity(entity); // Paper - ignore and warn about illegal addEntity calls instead of crashing server; moved down below valid=true
              if (entity instanceof ServerPlayer entityplayer) {
                  ServerLevel.this.players.add(entityplayer);
@@ -133,7 +133,7 @@ index 9ac697d12ec670e2f67d11d94a09de50c7bd0b9e..81ebb247a8d5c5cd77a3d4ce729146c9
                  ServerLevel.this.updateSleepingPlayerList();
              }
  
-@@ -2525,6 +2538,11 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2548,6 +2561,11 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              ServerLevel.this.getChunkSource().removeEntity(entity);
              if (entity instanceof ServerPlayer entityplayer) {
                  ServerLevel.this.players.remove(entityplayer);
@@ -305,18 +305,18 @@ index ad1aae2c06cae2f0c9756175a61dd32d8e7701ea..3d196ce60afd638867a337ecfa3dbe5a
 +    // Leaves end - fakeplayer support
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9729b3a7ce3027ff4eb02fcb908768d24f74a5f8..2dc27d27908a50101e5671809d1331db0cb2a96c 100644
+index d582615c0ca9f483f1da31e91e66b22129881d63..ed607672adc50f2929ee333fa2de29aa6e0f3bd5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1393,7 +1393,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1455,7 +1455,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return offsetFactor;
      }
  
 -    private Vec3 collide(Vec3 movement) {
 +    public Vec3 collide(Vec3 movement) { // Leaves - private -> public
-         AABB axisalignedbb = this.getBoundingBox();
+         // Paper start - optimise collisions
-         List<VoxelShape> list = this.level().getEntityCollisions(this, axisalignedbb.expandTowards(movement));
+         final boolean xZero = movement.x == 0.0;
-         Vec3 vec3d1 = movement.lengthSqr() == 0.0D ? movement : Entity.collideBoundingBox(this, movement, axisalignedbb, this.level(), list);
+         final boolean yZero = movement.y == 0.0;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 index 1223c5d23d0ea6aed068bdf0f5725e2ad49fc82c..0e00f59a8962dd6356d483ef5be3209a3a410008 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java

patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add isShrink to EntityResurrectEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 26b0ea6c699fc057395254e8f585c35946bbc7f3..3fb2b77c519992d5ac863f99a126468fdff9e458 100644
+index 428b42c2ac49cce7d4d99abaf6518c771d19117e..11c3fa7e974ff57f29d237b5b0f9eb3854497a44 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1644,12 +1644,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1662,12 +1662,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
              }
  
              org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null;
@@ -23,7 +23,7 @@ index 26b0ea6c699fc057395254e8f585c35946bbc7f3..3fb2b77c519992d5ac863f99a126468f
                      itemstack1.shrink(1);
                  }
                  if (itemstack != null && this instanceof ServerPlayer) {
-@@ -4627,3 +4627,4 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4663,3 +4663,4 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      }
  }

patches/server/0014-Budding-Amethyst-can-push-by-piston.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Budding Amethyst can push by piston
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 0c0b149a6cdfaf1de81bfbb92477fbb5c4a8a4bb..992c778f4a826be8d7a5a5d96bf7968b741f490e 100644
+index 6126fcb1bd724870068db0c39505a466b18cc320..bf4b451487bb308c088fde578f5c6524544df7b2 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -588,6 +588,12 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -38,10 +38,10 @@ index 8920855b07a31715327b8102c7faafc9f916825d..32d926a1b952b8069c5bf48c88e3c108
 +    // Leaves end - budding amethyst can push by piston
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index a768b07dae4bf75b68e3bc1d3de4b68fc7d23842..80635b82b1da66dbbd8363dd6ace0c2d0686ceb1 100644
+index 0f289d8f9bda2fb2ca2cd2dfd667a975529b3e4c..7426ad401d611a345eb0bee0b49012fcf5b970d5 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-@@ -1016,7 +1016,7 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -1104,7 +1104,7 @@ public abstract class BlockBehaviour implements FeatureElement {
          }
  
          public PushReaction getPistonPushReaction() {

patches/server/0019-Dont-send-useless-entity-packets.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Dont send useless entity packets
 This patch is Powered by Purpur(https://github.com/PurpurMC/Purpur)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 1d849ce4e2c85f149af25318b8ffb6dcef6c6788..0c6ee6a22768d3cdd9ddad1c6fbf9bdffd8b4257 100644
+index 8ea2f24695f5dad55e21f238b69442513e7a90c6..0846e11c82295ccf93683f877962ec7804dad677 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -200,6 +200,11 @@ public class ServerEntity {
+@@ -212,6 +212,11 @@ public class ServerEntity {
                      packet1 = new ClientboundTeleportEntityPacket(this.entity);
                      flag4 = true;
                      flag5 = true;
@@ -21,7 +21,7 @@ index 1d849ce4e2c85f149af25318b8ffb6dcef6c6788..0c6ee6a22768d3cdd9ddad1c6fbf9bdf
                  }
  
                  if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
-@@ -281,6 +286,21 @@ public class ServerEntity {
+@@ -294,6 +299,21 @@ public class ServerEntity {
          });
      }
  

patches/server/0024-Config-to-disable-method-profiler.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Config to disable method profiler
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e91c1db3bcb9f9139d4082e3868d7bcb9a9b084e..8806c9612e81f53241f5f16663aa781b8e03a98f 100644
+index 778a8c8a88128107b7ccd9bb4a783c0b519da9b1..cb9aae6ff466c07781963ca818ff7421e6bc3964 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2546,6 +2546,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2548,6 +2548,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
@@ -22,10 +22,10 @@ index e91c1db3bcb9f9139d4082e3868d7bcb9a9b084e..8806c9612e81f53241f5f16663aa781b
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 42206013ca0790f1366319669fe433640a74798c..6ff8be0ee869860d0afe0026f10aad1a108d0b56 100644
+index 6bda11e309ec1216f2d5c4fb4eafa8d8ff897192..cf48bc7e256af656dc1f491becb54faa2e648fac 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1520,6 +1520,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -1893,6 +1893,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      }
  
      public ProfilerFiller getProfiler() {

patches/server/0027-Remove-lambda-from-ticking-guard.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Remove lambda from ticking guard
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 43977320ffefa9bff45e63194005375d9a2fe8b0..b633f8df58397936799a2ba37fa73dd4a588828d 100644
+index 782b831f62cd2304fd70b22d468d9f990655ac72..75512c4217340c7a501f825f440ecb3229b1092e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -741,7 +741,23 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -758,7 +758,23 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
                              }
  
                              gameprofilerfiller.push("tick");

patches/server/0029-Remove-streams-and-iterators-from-range-check.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Remove streams and iterators from range check
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c6eeb3324fbf58eb7a6eb61aa7a8dfdc46bda4ae..0bcd9f3faba32c4dc1d115a9306594b9334657cb 100644
+index b729402e93f1b7847d7bd90af12e155030030bdd..0c2755e890bc5ca8a761614640d0c5443b15bd68 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1203,19 +1203,45 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1317,19 +1317,45 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
          }
  

patches/server/0030-Cache-climbing-check-for-activation.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Cache climbing check for activation
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e907b60c0898fb8ef5c79a11e68fe2a29392a5db..153853508da979046982e5e9c60eb655efcc5eb4 100644
+index 638cd59904499bc4dba7ff68d5676117a654ef86..abf5025cbab6c8f7902bd732ffaca07d1659ca62 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2055,6 +2055,22 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2073,6 +2073,22 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return this.lastClimbablePos;
      }
  

patches/server/0032-Reduce-entity-fluid-lookups-if-no-fluids.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Reduce entity fluid lookups if no fluids
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9e984f4bad722244d70d8b45755ca3abd0a22d4a..0653267c90fef463fa94f784012214809bc8c930 100644
+index 804f1ab4642e94127a00b305b37fec4c20d4250a..d3453751012d0ebfda1f4e93187820603bb27f08 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4292,16 +4292,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4455,16 +4455,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -35,7 +35,7 @@ index 9e984f4bad722244d70d8b45755ca3abd0a22d4a..0653267c90fef463fa94f78401221480
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4309,38 +4311,123 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4472,38 +4474,123 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
  
@@ -181,18 +181,18 @@ index 9e984f4bad722244d70d8b45755ca3abd0a22d4a..0653267c90fef463fa94f78401221480
              if (vec3d.length() > 0.0D) {
                  if (k1 > 0) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-index 8cd6c1d838e0332125fde3fc36475034aa4effa0..070821ae15ed1c4cd20129a983bbf73d17871799 100644
+index d4bd71f70f80ea74947e6d478ff636be2ab7d432..598e714120c9d6cfcf870cbb23f2e9f7432588eb 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-@@ -26,6 +26,7 @@ public class LevelChunkSection {
+@@ -25,6 +25,7 @@ public class LevelChunkSection implements ca.spottedleaf.moonrise.patches.collis
+     public final PalettedContainer<BlockState> states;
      // CraftBukkit start - read/write
      private PalettedContainer<Holder<Biome>> biomes;
-     public final com.destroystokyo.paper.util.maplist.IBlockDataList tickingList = new com.destroystokyo.paper.util.maplist.IBlockDataList(); // Paper
 +    public short fluidStateCount; // Leaves
  
-     public LevelChunkSection(PalettedContainer<BlockState> datapaletteblock, PalettedContainer<Holder<Biome>> palettedcontainerro) {
+     // Paper start - optimise collisions
-         // CraftBukkit end
+     private int specialCollidingBlocks;
-@@ -86,6 +87,7 @@ public class LevelChunkSection {
+@@ -91,6 +92,7 @@ public class LevelChunkSection implements ca.spottedleaf.moonrise.patches.collis
  
          if (!fluid.isEmpty()) {
              --this.tickingFluidCount;
@@ -200,19 +200,19 @@ index 8cd6c1d838e0332125fde3fc36475034aa4effa0..070821ae15ed1c4cd20129a983bbf73d
          }
  
          if (!state.isAir()) {
-@@ -100,6 +102,7 @@ public class LevelChunkSection {
+@@ -102,6 +104,7 @@ public class LevelChunkSection implements ca.spottedleaf.moonrise.patches.collis
  
          if (!fluid1.isEmpty()) {
              ++this.tickingFluidCount;
 +            --this.fluidStateCount; // Leaves
          }
  
-         return iblockdata1;
+         // Paper start - optimise collisions
-@@ -145,6 +148,7 @@ public class LevelChunkSection {
+@@ -181,6 +184,7 @@ public class LevelChunkSection implements ca.spottedleaf.moonrise.patches.collis
                      if (fluid.isRandomlyTicking()) {
-                         this.tickingFluidCount = (short) (this.tickingFluidCount + 1);
+                         this.tickingFluidCount += paletteCount;
                      }
 +                    LevelChunkSection.this.fluidStateCount++; // Leaves
                  }
- 
+             }
-             });
+         }

patches/server/0034-InstantBlockUpdater-Reintroduced.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] InstantBlockUpdater Reintroduced
 This patch is Powered by Carpet-TIS-Addition(https://github.com/plusls/Carpet-TIS-Addition)
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6ff8be0ee869860d0afe0026f10aad1a108d0b56..133c90ee13587c441ecd47038d389353940ad3bf 100644
+index cf48bc7e256af656dc1f491becb54faa2e648fac..5e5467564c4ead220b7b82b94eebb5ff6f8023fe 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -303,7 +303,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -679,7 +679,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
          this.thread = Thread.currentThread();
          this.biomeManager = new BiomeManager(this, i);
          this.isDebug = flag1;

patches/server/0036-BBOR-Protocol.patch

@@ -17,10 +17,10 @@ index 627c6b4bba6863ea89a2be2c3f163533e0d80147..4f3ae7cf3294583b738482964b78ebf2
  
      public boolean isAllowCommandsForAllPlayers() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index bfed0a72280631e6f20e6b5d493515c9b589db97..fa577dec9721c25f3c4897be939af7c2ba2e1c84 100644
+index 12ee7f3cef6cd41b23200bb53bb6fd2018039d49..60e137896271a6aed7604dfd256dc4686aab06db 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -746,6 +746,11 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -768,6 +768,11 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
  
      public void setLoaded(boolean loadedToWorld) {
          this.loaded = loadedToWorld;

patches/server/0037-PCA-sync-protocol.patch

@@ -103,7 +103,7 @@ index 6186e55014bbb9d5bedaa0e9d196879c55339d42..956c39ab508c2d8a7b9156aa53d65562
      protected Component getDefaultName() {
          return Component.translatable("container.barrel");
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 7b263fab4f0014400b3b8e7e33db32f9a125f6ba..cb9d6f3f57192675dc18d9fa80b22498b29da368 100644
+index f933fa419a4b55b0096ff42caf1b071d027b8e7e..c8891f72d3353faf4afe5b49e1759ee0fe475cc3 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -143,6 +143,11 @@ public class BeehiveBlockEntity extends BlockEntity {
@@ -240,7 +240,7 @@ index 431fb6a658c6aac43b6f9dbd1f578b83f261a4e3..138c045dc694c596083bc2f23831ca22
      protected Component getDefaultName() {
          return Component.translatable("container.dispenser");
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 8310d132006043e93c612890514c4c7f3eb1c74d..f523f888f2a0ac04f25b30e18cdd765c395cfc18 100644
+index 53f9d28bf3c6aafd4fdd6c12e0285500fe7350ce..5b7eedaa4f52ac72da417358034f3f457d6a2b45 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -134,6 +134,16 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen

patches/server/0039-Alternative-block-placement-Protocol.patch

@@ -63,7 +63,7 @@ index f8f909ebdad5e96379e8bd8c610164ef0697368e..0b761f3ae15ad4a3b8152f497a604032
                  if (iblockdata2 != null && this.canPlace(world, iblockdata2, blockposition)) {
                      iblockdata1 = iblockdata2;
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 992c778f4a826be8d7a5a5d96bf7968b741f490e..9fa6c828471bfba2209bd4903e7240e05b6ee2ec 100644
+index bf4b451487bb308c088fde578f5c6524544df7b2..1c65e73c81a1aef33ea01d0d2f82ebf6ab566299 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -411,6 +411,33 @@ public class Block extends BlockBehaviour implements ItemLike {

patches/server/0040-Player-operation-limiter.patch

@@ -62,7 +62,7 @@ index 9f32ed6b7f7c3dc0175cadf811956991b136be23..eee83b3e9bc409c987bf85970f9c2add
      // CraftBukkit end
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 24b1715397ba8e6f5e9841a030d0e3d964356f89..c0d29abf5a21015a4a0334549c0fd9b9f585f834 100644
+index cc01ead133cc6859ca5d7a1d0ac3c12955e590da..dea6b2cb7df6a9bb23cc56b0f97eaad9209c6527 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -339,6 +339,19 @@ public class ServerPlayerGameMode {

patches/server/0044-MC-Technical-Survival-Mode.patch

@@ -39,10 +39,10 @@ index 83a726bcf8b7dce73a361b0d79dbd63a0afc7a12..12cf1f7ba7d6c14b8b31d939b6f281bd
              throw new RuntimeException("Could not reload paper configuration files", ex);
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b633f8df58397936799a2ba37fa73dd4a588828d..ed9c83f2f6f078fab31e652bc04c2b886d719395 100644
+index 75512c4217340c7a501f825f440ecb3229b1092e..0d157e461eeb5b97290fadc602ab179a68285eda 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2460,7 +2460,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2483,7 +2483,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
          public void onTickingEnd(Entity entity) {
              ServerLevel.this.entityTickList.remove(entity);
              // Paper start - Reset pearls when they stop being ticked
@@ -104,7 +104,7 @@ index 5f7d152f41eb85f17bcded4bc8099b998e5a338b..cfc7edcf24646d1605d05c3782c7694b
  
          this.leftOwner = nbt.getBoolean("LeftOwner");
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 9c72271382fa0b6be5f38b45577fb1ae81ce80a3..a9fda9cb7e8266c21aba70d5b1890b30900a5b00 100644
+index 189a6bd4967aba72e12170e091dbb5b779e752a0..f0713e797b7ddfd39ebf96712983244f0abcf543 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -90,7 +90,7 @@ public final class NaturalSpawner {

patches/server/0045-Return-nether-portal-fix.patch

@@ -61,7 +61,7 @@ index 4f3ae7cf3294583b738482964b78ebf2bd65cbbf..f16d0a072ca78ddf3eeb3a483a73869e
  
          // Save player file again if they were disconnected
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 153853508da979046982e5e9c60eb655efcc5eb4..4875f0e4fabed287c8f923aa1505013a1e2f4911 100644
+index abf5025cbab6c8f7902bd732ffaca07d1659ca62..3f27a821fccbd95fbe5626c31daf2aaed1e382cc 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -260,7 +260,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0048-Leaves-Extra-Yggdrasil-Service.patch

@@ -44,7 +44,7 @@ index 244a19ecd0234fa1d7a6ecfea20751595688605d..7a1f7714616913cbb9d2dfc017567895
              String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
              LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8806c9612e81f53241f5f16663aa781b8e03a98f..bbea145c85a6c96e44bb174c5a3d1f54705ff4c9 100644
+index cb9aae6ff466c07781963ca818ff7421e6bc3964..7f6a25a186ca6ccd30964cf84b2c634bfb030ec9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -265,7 +265,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0049-Use-vanilla-random-config.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Use vanilla random config
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0653267c90fef463fa94f784012214809bc8c930..0bf2a2a5ccb558632c70d77b852167c3c90e5f49 100644
+index d3453751012d0ebfda1f4e93187820603bb27f08..2a37944ffb6a253428c0474d24b258e791a8cce0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -539,7 +539,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -559,7 +559,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          this.bb = Entity.INITIAL_AABB;
          this.stuckSpeedMultiplier = Vec3.ZERO;
          this.nextStep = 1.0F;

patches/server/0050-Fix-update-suppression-crash.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix update suppression crash
 
 
 diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
-index f7197f1347251a37dd0f6d9ffa2f09bc3a4e1233..8909f4f65864935f86608b0e00149c57833395aa 100644
+index 1f7f68aad97ee73763c042837f239bdc7167db55..1e8025ecb14acc7c24917793c97f54355b5a9346 100644
 --- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java
 +++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
-@@ -33,6 +33,10 @@ public class PacketUtils {
+@@ -53,6 +53,10 @@ public class PacketUtils {
                  if (listener.shouldHandleMessage(packet)) {
                      try {
                          packet.handle(listener);
@@ -20,10 +20,10 @@ index f7197f1347251a37dd0f6d9ffa2f09bc3a4e1233..8909f4f65864935f86608b0e00149c57
                          if (exception instanceof ReportedException) {
                              ReportedException reportedexception = (ReportedException) exception;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bbea145c85a6c96e44bb174c5a3d1f54705ff4c9..7dc6b8096379360c9a32ae66c5bfde9d2612f3cb 100644
+index 7f6a25a186ca6ccd30964cf84b2c634bfb030ec9..b6ffb96d527e5abcefd567373c2039a0291129ad 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1777,7 +1777,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1779,7 +1779,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.profiler.push("tick");
  
              try {

patches/server/0051-Bedrock-break-list.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Bedrock break list
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7dc6b8096379360c9a32ae66c5bfde9d2612f3cb..1a5c7e8473c8d183080f6995c2c76487d7ff5a68 100644
+index b6ffb96d527e5abcefd567373c2039a0291129ad..04b90b90c6fd90ffe8cbd712de48ed55fde6c1e0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1809,6 +1809,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1811,6 +1811,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol
  

patches/server/0064-Spawn-ignore-lc.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn ignore lc
 
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index a9fda9cb7e8266c21aba70d5b1890b30900a5b00..a8f792c1ac5740219f014bec5a3875be92b43be9 100644
+index f0713e797b7ddfd39ebf96712983244f0abcf543..5184df047c329323dfd1ebbf122963b4add098c3 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -199,6 +199,19 @@ public final class NaturalSpawner {

patches/server/0065-Elytra-aeronautics-no-chunk-load.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Elytra aeronautics no chunk load
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 0bcd9f3faba32c4dc1d115a9306594b9334657cb..bab8dbff18bd8435ed86336de067df0de3ca9145 100644
+index 0c2755e890bc5ca8a761614640d0c5443b15bd68..34fb3b4e991cf7bb7016e3b32bb8200a4914e947 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -169,14 +169,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -40,9 +40,9 @@ index 0bcd9f3faba32c4dc1d115a9306594b9334657cb..bab8dbff18bd8435ed86336de067df0d
  
      public void move(ServerPlayer player) {
 +        if (player.elytraAeronauticsNoChunk) return; // Leaves - no chunk
-         ObjectIterator objectiterator = this.entityMap.values().iterator();
+         // Paper - optimise entity tracker
  
-         while (objectiterator.hasNext()) {
+         SectionPos sectionposition = player.getLastSectionPos();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 index 51a1be78de7a794d13b64db6958977e2e9d20553..31ad4e4aaf321ab3c3909145e36a67744d906c65 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -57,10 +57,10 @@ index 51a1be78de7a794d13b64db6958977e2e9d20553..31ad4e4aaf321ab3c3909145e36a6774
                          !worldserver.areChunksLoadedForMove(entity.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(entity.position())))
                      )) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0bf2a2a5ccb558632c70d77b852167c3c90e5f49..f9a90bddb0bec8b67da3f9d05a0f3056048c8272 100644
+index 2a37944ffb6a253428c0474d24b258e791a8cce0..c9784715419c407821d3b30b0881ffa8c5866f35 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1081,7 +1081,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1136,7 +1136,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                      return;
                  }
              }
@@ -75,7 +75,7 @@ index 0bf2a2a5ccb558632c70d77b852167c3c90e5f49..f9a90bddb0bec8b67da3f9d05a0f3056
              this.level().getProfiler().push("move");
              if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
                  movement = movement.multiply(this.stuckSpeedMultiplier);
-@@ -1993,6 +1999,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2096,6 +2102,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          this.yo = y;
          this.zo = d4;
          this.setPos(d3, y, d4);

patches/server/0068-No-block-update-command.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] No block update command
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ed9c83f2f6f078fab31e652bc04c2b886d719395..628bc758d85a51a6cd48dc1a9581feef65cecd73 100644
+index 0d157e461eeb5b97290fadc602ab179a68285eda..828e879953981c41507a08b9b7c7c13ea551a76e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2251,6 +2251,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2274,6 +2274,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
  
      @Override
      public void blockUpdated(BlockPos pos, Block block) {
@@ -30,10 +30,10 @@ index fa3dbb93a049962fe10cb0391d437acdb45c82af..d9217d2a2be6bfa8eb099effac8587af
  
                          world.notifyAndUpdatePhysics(newblockposition, null, oldBlock, block, world.getBlockState(newblockposition), updateFlag, 512); // send null chunk as chunk.k() returns false by this point
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index fa577dec9721c25f3c4897be939af7c2ba2e1c84..94015519f379fab094b4b24c4b3a1900c1194e17 100644
+index 60e137896271a6aed7604dfd256dc4686aab06db..bfed97cf28be18ce82eda1ab7f105b4c0a5e7178 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -370,7 +370,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -392,7 +392,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
                  } else {
                      // CraftBukkit - Don't place while processing the BlockPlaceEvent, unless it's a BlockContainer. Prevents blocks such as TNT from activating when cancelled.
                      if (!this.level.isClientSide && doPlace && (!this.level.captureBlockStates || block instanceof net.minecraft.world.level.block.BaseEntityBlock)) {

patches/server/0072-Dont-respond-ping-before-start-fully.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Dont respond ping before start fully
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
-index 385457c7151f7e636e1ea2e38ef983f4f532b9b5..b35b0fcd5405c64d15f907ca4d3b33ae204a8d1e 100644
+index 532f09089b8d6798999cf3f83e852df7479e450e..85f8acea5923494d3a079387ddceae38419d9847 100644
 --- a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 @@ -154,6 +154,12 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene

patches/server/0073-Faster-chunk-serialization.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Faster chunk serialization
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/util/BitStorage.java b/src/main/java/net/minecraft/util/BitStorage.java
-index 8bafd5fd7499ba4a04bf706cfd1e156073716e21..91554e0f496a2df9cfe3131fbe3d9706e0a73a38 100644
+index 68648c5a5e3ff079f832092af0f2f801c42d1ede..0e4555ef99d150b28cabb79fc997b72935fb7ba5 100644
 --- a/src/main/java/net/minecraft/util/BitStorage.java
 +++ b/src/main/java/net/minecraft/util/BitStorage.java
 @@ -1,5 +1,7 @@
@@ -17,15 +17,16 @@ index 8bafd5fd7499ba4a04bf706cfd1e156073716e21..91554e0f496a2df9cfe3131fbe3d9706
  import java.util.function.IntConsumer;
  
  public interface BitStorage {
-@@ -31,4 +33,6 @@ public interface BitStorage {
+@@ -20,4 +22,7 @@ public interface BitStorage {
+     void unpack(int[] out);
  
-     }
+     BitStorage copy();
-     // Paper end
++
 +
 +    <T> void compact(Palette<T> srcPalette, Palette<T> dstPalette, short[] out); // Leaves - faster chunk serialization
  }
 diff --git a/src/main/java/net/minecraft/util/SimpleBitStorage.java b/src/main/java/net/minecraft/util/SimpleBitStorage.java
-index 8d7d763bf51cac556057645e6169c9447993189b..ba7e275627a2c253259cd4585eae2c7b08ce1983 100644
+index 9f438d9c6eb05e43d24e4af68188a3d4c46a938c..0958c753227b327af2390249212d11ddaccc527e 100644
 --- a/src/main/java/net/minecraft/util/SimpleBitStorage.java
 +++ b/src/main/java/net/minecraft/util/SimpleBitStorage.java
 @@ -3,6 +3,7 @@ package net.minecraft.util;
@@ -36,7 +37,7 @@ index 8d7d763bf51cac556057645e6169c9447993189b..ba7e275627a2c253259cd4585eae2c7b
  
  public class SimpleBitStorage implements BitStorage {
      private static final int[] MAGIC = new int[]{
-@@ -389,4 +390,44 @@ public class SimpleBitStorage implements BitStorage {
+@@ -367,4 +368,44 @@ public class SimpleBitStorage implements BitStorage {
              super(message);
          }
      }
@@ -82,7 +83,7 @@ index 8d7d763bf51cac556057645e6169c9447993189b..ba7e275627a2c253259cd4585eae2c7b
 +    // Leaves end - faster chunk serialization
  }
 diff --git a/src/main/java/net/minecraft/util/ZeroBitStorage.java b/src/main/java/net/minecraft/util/ZeroBitStorage.java
-index 01f5b946fabbe34f31110e75973dab9f39897346..54c7d9bed0fead691d06691086f04cc2521dbe07 100644
+index 50040c497a819cd1229042ab3cb057d34a32cacc..33cba55d41b305bf193268c04b93b742711231dd 100644
 --- a/src/main/java/net/minecraft/util/ZeroBitStorage.java
 +++ b/src/main/java/net/minecraft/util/ZeroBitStorage.java
 @@ -3,6 +3,7 @@ package net.minecraft.util;
@@ -93,7 +94,7 @@ index 01f5b946fabbe34f31110e75973dab9f39897346..54c7d9bed0fead691d06691086f04cc2
  
  public class ZeroBitStorage implements BitStorage {
      public static final long[] RAW = new long[0];
-@@ -71,4 +72,6 @@ public class ZeroBitStorage implements BitStorage {
+@@ -62,4 +63,6 @@ public class ZeroBitStorage implements BitStorage {
      public BitStorage copy() {
          return this;
      }
@@ -112,7 +113,7 @@ index acae3eb30e0689048937f479dc3070f0688abdad..029b62acf1d9f8479ab64a55c12f00ba
      int onResize(int newBits, T object);
  }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index 81368bf186365878db2e1ed305bb7bf36c26f61f..c753dbe90aa4126a4c3ad79bb8d6768cb06c096b 100644
+index 13d3c877b006a4975e7370713e3919c661e7890f..fd8dc6395f6a307971f781c40768845b6e10e22e 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 @@ -23,8 +23,25 @@ import net.minecraft.util.Mth;

patches/server/0079-Cache-BlockStatePairKey-hash.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Cache BlockStatePairKey hash
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 9fa6c828471bfba2209bd4903e7240e05b6ee2ec..fc92ee39038cc4218741aca78294b4b0757796d5 100644
+index 1c65e73c81a1aef33ea01d0d2f82ebf6ab566299..137344b81d8060c49353898cd85af805f8572470 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -626,11 +626,18 @@ public class Block extends BlockBehaviour implements ItemLike {

patches/server/0082-Reduce-array-allocations.patch

@@ -193,7 +193,7 @@ index ff13d67151c50ea11a45117e524c7524e2b1a202..8c3ee4c9aa22bcc46f2dc3a5bc35bdde
  
      @Override
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 90a2c61c42cba7e38f167eccdd7a951a947963c4..2d6b221899a40e9bb4a52b21a62b71f7d1c26a80 100644
+index 3e550f8e7cd4f4e16f499a8a2a4b95420270f07a..85244ae421d03f7f47d21857f5a3c849008fc541 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -66,6 +66,7 @@ import org.apache.commons.lang3.Validate;
@@ -205,10 +205,10 @@ index 90a2c61c42cba7e38f167eccdd7a951a947963c4..2d6b221899a40e9bb4a52b21a62b71f7
  public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 0c6ee6a22768d3cdd9ddad1c6fbf9bdffd8b4257..c6b7cd3035e9e222993438bac7e4774cd2c4f203 100644
+index 0846e11c82295ccf93683f877962ec7804dad677..b747b3858befe48996ea707cf126f6f8496258fd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -356,7 +356,7 @@ public class ServerEntity {
+@@ -369,7 +369,7 @@ public class ServerEntity {
  
          if (this.entity instanceof LivingEntity) {
              List<Pair<EquipmentSlot, ItemStack>> list = Lists.newArrayList();
@@ -218,7 +218,7 @@ index 0c6ee6a22768d3cdd9ddad1c6fbf9bdffd8b4257..c6b7cd3035e9e222993438bac7e4774c
  
              for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 628bc758d85a51a6cd48dc1a9581feef65cecd73..ddeb36942d963ba81a85769eb65eddf0b4699528 100644
+index 828e879953981c41507a08b9b7c7c13ea551a76e..73f734ffcf007857bd13235dc14da930dbbe3928 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -181,6 +181,7 @@ import org.bukkit.event.server.MapInitializeEvent;
@@ -329,7 +329,7 @@ index c038da20b76c0b7b1c18471b20be01e849d29f3a..603007a376dc76c46d34f265283dda69
  
      public boolean isEmpty() {
 diff --git a/src/main/java/net/minecraft/util/ZeroBitStorage.java b/src/main/java/net/minecraft/util/ZeroBitStorage.java
-index 54c7d9bed0fead691d06691086f04cc2521dbe07..0c6007c9dbd053cba641038955ef1ca1422c4d6d 100644
+index 33cba55d41b305bf193268c04b93b742711231dd..4200e9c5f047e3a124c61a28ff26bf30e8368b5a 100644
 --- a/src/main/java/net/minecraft/util/ZeroBitStorage.java
 +++ b/src/main/java/net/minecraft/util/ZeroBitStorage.java
 @@ -4,9 +4,10 @@ import java.util.Arrays;
@@ -357,10 +357,10 @@ index 2fa2a4eef21e786f738f36616c3160defa95bce8..36c98f611f043ebadffd1b110ba3002b
      private EquipmentSlot(final EquipmentSlot.Type type, final int entityId, final int maxCount, final int armorStandId, final String name) {
          this.type = type;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4875f0e4fabed287c8f923aa1505013a1e2f4911..23358cb5eed7b73e61467737e3c763a242ce3059 100644
+index 3f27a821fccbd95fbe5626c31daf2aaed1e382cc..2c385a89db50d85ff65df7b20dcfefdc21856cca 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3262,7 +3262,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3280,7 +3280,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      @Nullable
      private Map<EquipmentSlot, ItemStack> collectEquipmentChanges() {
          Map<EquipmentSlot, ItemStack> map = null;
@@ -422,16 +422,16 @@ index 1bf54b0142fe41b29b21c8b97d3f52bb24a36a92..f19ace4f9027260ded3ee37c1bda91c5
  public class ShapedRecipe extends io.papermc.paper.inventory.recipe.RecipeBookExactChoiceRecipe<CraftingInput> implements CraftingRecipe { // Paper - improve exact recipe choices
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 133c90ee13587c441ecd47038d389353940ad3bf..b4e10f82edbbe5301ddcf13f33f2f857eb2858a9 100644
+index 5e5467564c4ead220b7b82b94eebb5ff6f8023fe..9364fe8494b42d4e7061f9d08bbdcaeb8892452c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -101,6 +101,7 @@ import org.bukkit.craftbukkit.util.CraftSpawnCategory;
+@@ -102,6 +102,7 @@ import org.bukkit.craftbukkit.util.CraftSpawnCategory;
  import org.bukkit.entity.SpawnCategory;
  import org.bukkit.event.block.BlockPhysicsEvent;
  // CraftBukkit end
 +import org.leavesmc.leaves.util.ArrayConstants;
  
- public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevel, ca.spottedleaf.moonrise.patches.chunk_system.world.ChunkSystemEntityGetter { // Paper - rewrite chunk system
+ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevel, ca.spottedleaf.moonrise.patches.chunk_system.world.ChunkSystemEntityGetter, ca.spottedleaf.moonrise.patches.collisions.world.CollisionLevel { // Paper - rewrite chunk system // Paper - optimise collisions
  
 diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
 index d3d12f9114173f4971f95d7ef895a4374705bd3f..d9e28a241f7fc9c6828dc3b169f56bad08db5b04 100644

patches/server/0083-Optimize-sun-burn-tick.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize sun burn tick
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f9a90bddb0bec8b67da3f9d05a0f3056048c8272..8c89114f34a7b3807efa4f012f378bfa24b5cc6f 100644
+index c9784715419c407821d3b30b0881ffa8c5866f35..4529c975e573c68bc57a735384b5b8baea7dfc38 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1975,8 +1975,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2078,8 +2078,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      /** @deprecated */
      @Deprecated
      public float getLightLevelDependentMagicValue() {

patches/server/0087-Check-frozen-ticks-before-landing-block.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Check frozen ticks before landing block
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index eb1ab66ebe14db9a425b65652ef9deace8ea80fa..985f5807bcf9edaa39f74583d7927daabbcd11d9 100644
+index 2c385a89db50d85ff65df7b20dcfefdc21856cca..f45c1d6ec163566b7877cf4ec6809b3bb603bb30 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -564,11 +564,11 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0088-Skip-entity-move-if-movement-is-zero.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Skip entity move if movement is zero
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8c89114f34a7b3807efa4f012f378bfa24b5cc6f..18a1a6211620c2f3f9d6fad022daa2d45d993f60 100644
+index 4529c975e573c68bc57a735384b5b8baea7dfc38..ad919f7c613549a25656109fc66251dcf9f7989b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -324,6 +324,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -17,8 +17,8 @@ index 8c89114f34a7b3807efa4f012f378bfa24b5cc6f..18a1a6211620c2f3f9d6fad022daa2d4
      public boolean onGround;
      public boolean horizontalCollision;
      public boolean verticalCollision;
-@@ -1068,6 +1069,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1113,6 +1114,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     }
+     // Paper end - detailed watchdog information
  
      public void move(MoverType movementType, Vec3 movement) {
 +        // Leaves start - skip entity move if movement is zero
@@ -29,9 +29,9 @@ index 8c89114f34a7b3807efa4f012f378bfa24b5cc6f..18a1a6211620c2f3f9d6fad022daa2d4
 +        }
 +        // Leaves end - skip entity move if movement is zero
          final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
-         if (this.noPhysics) {
+         // Paper start - detailed watchdog information
-             this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
+         io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
-@@ -4002,6 +4010,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4162,6 +4170,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public final void setBoundingBox(AABB boundingBox) {

patches/server/0090-Skip-negligible-planar-movement-multiplication.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Skip negligible planar movement multiplication
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 18a1a6211620c2f3f9d6fad022daa2d45d993f60..4f984341827634d7a5eef449657c513bf8a70a0b 100644
+index ad919f7c613549a25656109fc66251dcf9f7989b..056f56fd321aa2f23b633f7c59672e2ef4c32a9e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1230,9 +1230,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1285,9 +1285,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  }
  
                  this.tryCheckInsideBlocks();

patches/server/0096-Force-peaceful-mode-switch.patch

@@ -69,7 +69,7 @@ index 48991b885c7cad9c201887b222acad7d700bd03b..86ef1073c47ce430cd94befa8119dcac
  
                          if (this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) {
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index a8f792c1ac5740219f014bec5a3875be92b43be9..f4e51c626007252734ac9776c6a5ec3346f6ab09 100644
+index 5184df047c329323dfd1ebbf122963b4add098c3..3140d20aff7b1c518330bae088574e7163793eaf 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -127,6 +127,12 @@ public final class NaturalSpawner {
@@ -98,7 +98,7 @@ index a8f792c1ac5740219f014bec5a3875be92b43be9..f4e51c626007252734ac9776c6a5ec33
              boolean spawnThisTick = true;
              int limit = enumcreaturetype.getMaxInstancesPerChunk();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8045d6c9398d1c88595da6e41aa1ed27fb6fbad0..2f7de6dc538d147fd80885c1428112b7478b04ca 100644
+index 74f4938c88b547c326c335aac09ab47fed3ea588..f7f65f3b7c0298e1e4fee4692ee6cce3bae707b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2372,6 +2372,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {

patches/server/0097-Replay-Mod-API.patch

@@ -108,10 +108,10 @@ index c8d39e6e1c570c9219f6066da273dc0130920519..96a074281d16a7f64058619da4b102f3
                              if (((List) object).size() >= i) {
                                  return (List) object;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1a5c7e8473c8d183080f6995c2c76487d7ff5a68..ebbb18d2e741e535dbfeca364d0f2d0d27a96c7d 100644
+index 04b90b90c6fd90ffe8cbd712de48ed55fde6c1e0..8794ea476463fa035fb2d658594d1c633025523f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1681,7 +1681,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1682,7 +1682,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      private ServerStatus.Players buildPlayerStatus() {
@@ -147,10 +147,10 @@ index e7b444a10b244828827b3c66c53465206ea8e0ec..030601fdfde2232a933b2ad7022e9909
                                          .filter(player -> !playerList.isOp(player.getGameProfile()))
                                          .map(player -> player.getGameProfile().getName()),
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ddeb36942d963ba81a85769eb65eddf0b4699528..3f9e6c71bc2495ea679e8051d478b7818fc22526 100644
+index 73f734ffcf007857bd13235dc14da930dbbe3928..d25dd7cf4e59138cfc826503b9d75eb086718d81 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2475,7 +2475,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2498,7 +2498,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              if (entity instanceof ServerPlayer entityplayer) {
                  ServerLevel.this.players.add(entityplayer);
                  // Leaves start - skip
@@ -159,7 +159,7 @@ index ddeb36942d963ba81a85769eb65eddf0b4699528..3f9e6c71bc2495ea679e8051d478b781
                      ServerLevel.this.realPlayers.add(entityplayer);
                  }
                  // Leaves end - skip
-@@ -2557,7 +2557,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2580,7 +2580,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              if (entity instanceof ServerPlayer entityplayer) {
                  ServerLevel.this.players.remove(entityplayer);
                  // Leaves start - skip

patches/server/0109-Armor-stand-cant-kill-by-mob-projectile.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Armor stand cant kill by mob projectile
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index df29a54063ee957c2b88a12ef228c7d8541a2f2c..93d4345695f69c94325edda17fb9aee65bf61ce5 100644
+index 9ab1c4dccf0cc96ecc6f3a2a8dbcb38df0b530af..9883db7b41c44fdb878ae3e110b1339a87dfa7a3 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -531,6 +531,14 @@ public class ArmorStand extends LivingEntity {