diff --git a/build.gradle.kts b/build.gradle.kts
index 817a526..7221162 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.9"
+    id("io.papermc.paperweight.patcher") version "1.5.11"
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
+    remapper("net.fabricmc:tiny-remapper:0.8.10:fat")
     decompiler("net.minecraftforge:forgeflower:2.0.627.2")
     paperclip("io.papermc:paperclip:3.0.3")
 }
diff --git a/gradle.properties b/gradle.properties
index c225a6c..438c33d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 group=dev.folia
 
-version=1.20.2-R0.1-SNAPSHOT
-mcVersion=1.20.2
-paperRef=ce7f0680956bb1c779ac4db9fe0fd1f00bb35bae
+version=1.20.4-R0.1-SNAPSHOT
+mcVersion=1.20.4
+paperRef=f1820dc80a02009980e6466ea5847933861b911a
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135..d64cd49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3fa8f86..1af9e09 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/patches/api/0002-Region-scheduler-API.patch b/patches/api/0002-Region-scheduler-API.patch
index ad879bc..0c50c05 100644
--- a/patches/api/0002-Region-scheduler-API.patch
+++ b/patches/api/0002-Region-scheduler-API.patch
@@ -23,7 +23,7 @@ index fc2dae69165776d08274e34a69962cc70445f411..06149045a44148bf0af5f52952ff0092
              }
  
 diff --git a/src/main/java/org/bukkit/scheduler/BukkitScheduler.java b/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
-index d2ab2ee1e1e8fbaac4edef5b3ee313ee4ceb6991..8476504e3d54721c64f02eddd5b48193ac8f366b 100644
+index 487b5ca23159b531475c3d650894be707b49914e..31b90d1c2259a8f200b0589909dbbfe4cc526989 100644
 --- a/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
 +++ b/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
 @@ -7,6 +7,15 @@ import java.util.function.Consumer;
diff --git a/patches/api/0005-Add-API-for-checking-ownership-of-region-by-position.patch b/patches/api/0005-Add-API-for-checking-ownership-of-region-by-position.patch
index c14b660..19be254 100644
--- a/patches/api/0005-Add-API-for-checking-ownership-of-region-by-position.patch
+++ b/patches/api/0005-Add-API-for-checking-ownership-of-region-by-position.patch
@@ -11,7 +11,7 @@ the schedulers depending on the result of the ownership
 check.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 884902cb7f86c0b56594ccafc7d05c6c7a23ab53..b7e1c8bd8dd38e1a9e74925740b22dad61a75f49 100644
+index 4863d9f21f0a0f11974be85360edc587ffd7eab3..56548d416cb116b0f130a18a3c0ee8aed51a7be0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2827,6 +2827,14 @@ public final class Bukkit {
@@ -30,7 +30,7 @@ index 884902cb7f86c0b56594ccafc7d05c6c7a23ab53..b7e1c8bd8dd38e1a9e74925740b22dad
      @NotNull
      public static Server.Spigot spigot() {
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d0c634629aa0b6bac0da93655dd86ad3aea0ce30..85b169c04f44431363d4e14d4857140f160ceace 100644
+index f1fa97d12f97baf97beb92ca0719cf3cf906b225..e25f86fb8d4bda9284744c0b8ae7db4f4f9f93a0 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2473,4 +2473,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index a82de93..f8997d9 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 79beac737c17412913983614bd478d33e3c6ed58..0cd12a854e544e867abfd94c18a9f138ba57e587 100644
+index 170a915098f09ace226648da342a04c5c7583d11..512496d086b21bd0d5c5cc070a41185eedc6c2f1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
- val alsoShade: Configuration by configurations.creating
+@@ -27,8 +27,12 @@ repositories {
  
  dependencies {
+     extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT"))
 -    implementation(project(":paper-api"))
 -    implementation(project(":paper-mojangapi"))
 +    // Folia start
@@ -23,7 +23,7 @@ index 79beac737c17412913983614bd478d33e3c6ed58..0cd12a854e544e867abfd94c18a9f138
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -70,7 +74,7 @@ tasks.jar {
+@@ -84,7 +88,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -32,7 +32,7 @@ index 79beac737c17412913983614bd478d33e3c6ed58..0cd12a854e544e867abfd94c18a9f138
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -154,7 +158,7 @@ fun TaskContainer.registerRunTask(
+@@ -168,7 +172,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -93,10 +93,10 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..e2f704c115fd6e00960bb56bb0779f11
              ).openBufferedStream()) {
                  JsonObject json = new Gson().fromJson(reader, JsonObject.class);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8f31413c939cc2b0454ad3d9a1b618dbae449d00..6758e3ff1100bba2852e44cbb0b38ce4f22490e8 100644
+index 34f19ac897a30c0c4e3ab406013fcca1c8b7db93..5ed6c8710b78458031ed6b0273fb2f6a5f482ea7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1697,7 +1697,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1866,7 +1866,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -106,10 +106,10 @@ index 8f31413c939cc2b0454ad3d9a1b618dbae449d00..6758e3ff1100bba2852e44cbb0b38ce4
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9c08303de2891de92e06de8a939a618b7a6f7321..bbc51ebf0dc0801ace9d5e7875fb2fe100b286bc 100644
+index 782bb8ca67517dde5dba8f0a133eb8699353dd01..f4ba1b9adbd0e526421a755fd6c536fe20ffa716 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper
+@@ -270,7 +270,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
diff --git a/patches/server/0003-Threaded-Regions.patch b/patches/server/0003-Threaded-Regions.patch
index 527da6d..e082d92 100644
--- a/patches/server/0003-Threaded-Regions.patch
+++ b/patches/server/0003-Threaded-Regions.patch
@@ -2410,10 +2410,10 @@ index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..057df4b34a9eb252965aa2510b364e44
 +    // Folia end - threaded regions
  }
 diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-index ed79d30f33b2674863b2d73b1abdb48433c33412..f1c4263e1c9ba532450c155acceeab4f663b13c4 100644
+index 071d3877e386a0c7c4d2f2e8ddd06e0765c49d0d..f8a2a4494edccb25a4403a69581fe7920d9d0de3 100644
 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-@@ -468,6 +468,14 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -469,6 +469,14 @@ public class WorldConfiguration extends ConfigurationPart {
      public Chunks chunks;
  
      public class Chunks extends ConfigurationPart {
@@ -2429,10 +2429,10 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..f1c4263e1c9ba532450c155acceeab4f
          public int maxAutoSaveChunksPerTick = 24;
          public int fixedChunkInhabitedTime = -1;
 diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java
-index 9c7552968b8c017c71a7a77557a66a03ed89f125..3b5572662c53715cd63772db90904dd1bed32390 100644
+index 846bdcccf1031e41c4da29da885aa4d438507631..22261a558407af905474d07a207a0b4775db86ae 100644
 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java
 +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java
-@@ -240,10 +240,19 @@ class PaperPluginInstanceManager {
+@@ -244,10 +244,19 @@ class PaperPluginInstanceManager {
                  + pluginName + " (Is it up to date?)", ex, plugin); // Paper
          }
  
@@ -2878,7 +2878,7 @@ index 0000000000000000000000000000000000000000..1f48ada99d6d24880f9bda1cd05d41a4
 +}
 diff --git a/src/main/java/io/papermc/paper/threadedregions/RegionizedServer.java b/src/main/java/io/papermc/paper/threadedregions/RegionizedServer.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..1e3117ccd51be58d988089207a3efdbff02fc374
+index 0000000000000000000000000000000000000000..fc3d332aa1c1d469cedfe2aaa7102dcd78e25642
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/threadedregions/RegionizedServer.java
 @@ -0,0 +1,455 @@
@@ -3208,7 +3208,7 @@ index 0000000000000000000000000000000000000000..1e3117ccd51be58d988089207a3efdbf
 +        // copied from MinecraftServer#tickServer
 +        // note: we need to reorder setPlayers to be the last operation it does, rather than the first to avoid publishing
 +        // an uncomplete status
-+        if (currtime - this.lastServerStatus >= 5000000000L) {
++        if (currtime - this.lastServerStatus >= MinecraftServer.STATUS_EXPIRE_TIME_NANOS) {
 +            this.lastServerStatus = currtime;
 +            mcServer.rebuildServerStatus();
 +        }
@@ -8806,10 +8806,10 @@ index e08f4e39db4ee3fed62e37364d17dcc5c5683504..7e92e14cdb9f3d895550991b2ea154a6
      }
  }
 diff --git a/src/main/java/io/papermc/paper/util/CollisionUtil.java b/src/main/java/io/papermc/paper/util/CollisionUtil.java
-index bfb1de19f53d5d7c7b65e25a606fabfa416706b3..61e51d68df3bc5be3622c32025af9cb418b4ca75 100644
+index 5d4c5cc8eb06f2e6c31df6cbb98ea642b2264d49..0f74d6d64437150ad8f154354162f6ffe0532180 100644
 --- a/src/main/java/io/papermc/paper/util/CollisionUtil.java
 +++ b/src/main/java/io/papermc/paper/util/CollisionUtil.java
-@@ -1648,7 +1648,7 @@ public final class CollisionUtil {
+@@ -1650,7 +1650,7 @@ public final class CollisionUtil {
  
          for (int currChunkZ = minChunkZ; currChunkZ <= maxChunkZ; ++currChunkZ) {
              for (int currChunkX = minChunkX; currChunkX <= maxChunkX; ++currChunkX) {
@@ -8863,10 +8863,10 @@ index 413e4b6da027876dbbe8eb78f2568a440f431547..3a7dbcb9964723b8ed5e6b0a1ee42679
          throw new RuntimeException();
      }
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index 8240bb085b619f257f8c0a25775e0b15068e440f..8f91b7f44baaf62b829a81afc0633311e6c13f19 100644
+index 200ed770b57e1a9240abf0473968d4b85cbefe3c..1f0ec6add54b7503415d5f4141fe2b6046f1ec69 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -336,6 +336,7 @@ public final class MCUtil {
+@@ -335,6 +335,7 @@ public final class MCUtil {
       */
      public static void ensureMain(String reason, Runnable run) {
          if (!isMainThread()) {
@@ -8874,7 +8874,7 @@ index 8240bb085b619f257f8c0a25775e0b15068e440f..8f91b7f44baaf62b829a81afc0633311
              if (reason != null) {
                  MinecraftServer.LOGGER.warn("Asynchronous " + reason + "!", new IllegalStateException());
              }
-@@ -476,6 +477,30 @@ public final class MCUtil {
+@@ -475,6 +476,30 @@ public final class MCUtil {
          return new Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ());
      }
  
@@ -9350,23 +9350,23 @@ index 0000000000000000000000000000000000000000..cf9b66afc1762dbe2c625f09f9e804ca
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index 56ae02aab93b9a698e9d2f07a0448aa4767169d9..4e196b4e7bc8ac6da8d3e61e68bdf461c7ea821f 100644
+index 14f4c0a93372a58cf36dc95265b5e210ea1605e5..b0d68a04b185c37659e7b42dd931b6d288970b2d 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-@@ -69,7 +69,7 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
+@@ -68,7 +68,7 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
+     public boolean bypassSelectorPermissions = false; // Paper
  
      public CommandSourceStack(CommandSource output, Vec3 pos, Vec2 rot, ServerLevel world, int level, String name, Component displayName, MinecraftServer server, @Nullable Entity entity) {
-         this(output, pos, rot, world, level, name, displayName, server, entity, false, (commandcontext, flag, j) -> {
--        }, EntityAnchorArgument.Anchor.FEET, CommandSigningContext.ANONYMOUS, TaskChainer.immediate(server), (j) -> {
-+        }, EntityAnchorArgument.Anchor.FEET, CommandSigningContext.ANONYMOUS, TaskChainer.immediate((Runnable run) -> { io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(run);}), (j) -> { // Folia - region threading
-         });
+-        this(output, pos, rot, world, level, name, displayName, server, entity, false, CommandResultCallback.EMPTY, EntityAnchorArgument.Anchor.FEET, CommandSigningContext.ANONYMOUS, TaskChainer.immediate(server));
++        this(output, pos, rot, world, level, name, displayName, server, entity, false, CommandResultCallback.EMPTY, EntityAnchorArgument.Anchor.FEET, CommandSigningContext.ANONYMOUS, TaskChainer.immediate((Runnable run) -> { io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(run);})); // Folia - region threading
      }
  
+     protected CommandSourceStack(CommandSource output, Vec3 pos, Vec2 rot, ServerLevel world, int level, String name, Component displayName, MinecraftServer server, @Nullable Entity entity, boolean silent, CommandResultCallback resultStorer, EntityAnchorArgument.Anchor entityAnchor, CommandSigningContext signedArguments, TaskChainer messageChainTaskQueue) {
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 3eec879bf3975636739b2491cc05b8177032d16d..3435bdeaf723c64103f7c924ea42a4ec78f2ba01 100644
+index 55f3f5396dac2b0bb0cc37b537547e9245042100..d94771b6e36b21ce9dcecfee56682f54576446da 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -146,13 +146,13 @@ public class Commands {
+@@ -159,13 +159,13 @@ public class Commands {
          AdvancementCommands.register(this.dispatcher);
          AttributeCommand.register(this.dispatcher, commandRegistryAccess);
          ExecuteCommand.register(this.dispatcher, commandRegistryAccess);
@@ -9385,7 +9385,7 @@ index 3eec879bf3975636739b2491cc05b8177032d16d..3435bdeaf723c64103f7c924ea42a4ec
          DefaultGameModeCommands.register(this.dispatcher);
          DifficultyCommand.register(this.dispatcher);
          EffectCommands.register(this.dispatcher, commandRegistryAccess);
-@@ -162,47 +162,47 @@ public class Commands {
+@@ -175,46 +175,46 @@ public class Commands {
          FillCommand.register(this.dispatcher, commandRegistryAccess);
          FillBiomeCommand.register(this.dispatcher, commandRegistryAccess);
          ForceLoadCommand.register(this.dispatcher);
@@ -9438,17 +9438,15 @@ index 3eec879bf3975636739b2491cc05b8177032d16d..3435bdeaf723c64103f7c924ea42a4ec
 +        //TeamMsgCommand.register(this.dispatcher); // Folia - region threading - TODO later
          TeleportCommand.register(this.dispatcher);
          TellRawCommand.register(this.dispatcher);
+         TickCommand.register(this.dispatcher);
          TimeCommand.register(this.dispatcher);
          TitleCommand.register(this.dispatcher);
 -        TriggerCommand.register(this.dispatcher);
 +        //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
          WeatherCommand.register(this.dispatcher);
--        WorldBorderCommand.register(this.dispatcher);
-+        //WorldBorderCommand.register(this.dispatcher); // Folia - region threading - TODO later
+         WorldBorderCommand.register(this.dispatcher);
          if (JvmProfiler.INSTANCE.isAvailable()) {
-             JfrCommand.register(this.dispatcher);
-         }
-@@ -223,8 +223,8 @@ public class Commands {
+@@ -243,8 +243,8 @@ public class Commands {
              OpCommand.register(this.dispatcher);
              PardonCommand.register(this.dispatcher);
              PardonIpCommand.register(this.dispatcher);
@@ -9459,7 +9457,7 @@ index 3eec879bf3975636739b2491cc05b8177032d16d..3435bdeaf723c64103f7c924ea42a4ec
              SaveOffCommand.register(this.dispatcher);
              SaveOnCommand.register(this.dispatcher);
              SetPlayerIdleTimeoutCommand.register(this.dispatcher);
-@@ -454,9 +454,12 @@ public class Commands {
+@@ -508,9 +508,12 @@ public class Commands {
          }
          // Paper start - Async command map building
          new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper
@@ -9489,10 +9487,10 @@ index 155bd3d6d9c7d3cac7fd04de8210301251d1e17a..446f590dcf8f1d30b365e71515683c9a
          }
  
 diff --git a/src/main/java/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java
-index 80dbeb0a988c749feaaba26ce5ad93c181d88a5d..e92d8c8f6b208642e87cdb4080d3b38f95d84503 100644
+index 6df0db8b4cdab23494ea34236949ece4989110a3..2fd670d941bd575f99def28732ffee29f37a3182 100644
 --- a/src/main/java/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java
-@@ -62,7 +62,7 @@ public class BoatDispenseItemBehavior extends DefaultDispenseItemBehavior {
+@@ -63,7 +63,7 @@ public class BoatDispenseItemBehavior extends DefaultDispenseItemBehavior {
          CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
  
          BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(d1, d2 + d4, d3));
@@ -9502,10 +9500,10 @@ index 80dbeb0a988c749feaaba26ce5ad93c181d88a5d..e92d8c8f6b208642e87cdb4080d3b38f
          }
  
 diff --git a/src/main/java/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
-index 379890ae05b2fb4bd81b2fa907413d3736ba1169..4ea33c913b005d81a600215ac35a644ee1396cb3 100644
+index 6c78d90e73b47b62c4052727730850d4b67a9cd2..22bd34cf8994082e1b33d58f21ae86219d642b33 100644
 --- a/src/main/java/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
-@@ -74,7 +74,7 @@ public class DefaultDispenseItemBehavior implements DispenseItemBehavior {
+@@ -85,7 +85,7 @@ public class DefaultDispenseItemBehavior implements DispenseItemBehavior {
          CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
  
          BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), CraftVector.toBukkit(entityitem.getDeltaMovement()));
@@ -9515,7 +9513,7 @@ index 379890ae05b2fb4bd81b2fa907413d3736ba1169..4ea33c913b005d81a600215ac35a644e
          }
  
 diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index a0c7c6208314d981e8577ad69ef1c5193290a085..f0c2ee38e9101a6c593f6deb6b8101b72ad4a067 100644
+index e6ac20a38f31bb0cd6b8840b2518f6992ef7f518..97a1a99258536f4d2d671964d0eaf8f865190e8a 100644
 --- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 @@ -222,7 +222,7 @@ public interface DispenseItemBehavior {
@@ -9590,7 +9588,7 @@ index a0c7c6208314d981e8577ad69ef1c5193290a085..f0c2ee38e9101a6c593f6deb6b8101b7
                          worldserver.getCraftServer().getPluginManager().callEvent(event);
                      }
  
-@@ -707,7 +707,7 @@ public interface DispenseItemBehavior {
+@@ -708,7 +708,7 @@ public interface DispenseItemBehavior {
                          CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack.copyWithCount(1)); // Paper - single item in event
  
                          BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
@@ -9599,7 +9597,7 @@ index a0c7c6208314d981e8577ad69ef1c5193290a085..f0c2ee38e9101a6c593f6deb6b8101b7
                              worldserver.getCraftServer().getPluginManager().callEvent(event);
                          }
  
-@@ -754,7 +754,7 @@ public interface DispenseItemBehavior {
+@@ -755,7 +755,7 @@ public interface DispenseItemBehavior {
                  CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack);
  
                  BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
@@ -9608,7 +9606,7 @@ index a0c7c6208314d981e8577ad69ef1c5193290a085..f0c2ee38e9101a6c593f6deb6b8101b7
                      worldserver.getCraftServer().getPluginManager().callEvent(event);
                  }
  
-@@ -815,7 +815,7 @@ public interface DispenseItemBehavior {
+@@ -818,7 +818,7 @@ public interface DispenseItemBehavior {
                  CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack.copyWithCount(1)); // Paper - single item in event
  
                  BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
@@ -9617,7 +9615,7 @@ index a0c7c6208314d981e8577ad69ef1c5193290a085..f0c2ee38e9101a6c593f6deb6b8101b7
                      worldserver.getCraftServer().getPluginManager().callEvent(event);
                  }
  
-@@ -833,7 +833,8 @@ public interface DispenseItemBehavior {
+@@ -837,7 +837,8 @@ public interface DispenseItemBehavior {
                      }
                  }
  
@@ -9627,7 +9625,7 @@ index a0c7c6208314d981e8577ad69ef1c5193290a085..f0c2ee38e9101a6c593f6deb6b8101b7
                  // CraftBukkit end
  
                  if (!BoneMealItem.growCrop(stack, worldserver, blockposition) && !BoneMealItem.growWaterPlant(stack, worldserver, blockposition, (Direction) null)) {
-@@ -842,13 +843,13 @@ public interface DispenseItemBehavior {
+@@ -846,13 +847,13 @@ public interface DispenseItemBehavior {
                      worldserver.levelEvent(1505, blockposition, 0);
                  }
                  // CraftBukkit start
@@ -9647,7 +9645,7 @@ index a0c7c6208314d981e8577ad69ef1c5193290a085..f0c2ee38e9101a6c593f6deb6b8101b7
                      StructureGrowEvent structureEvent = null;
                      if (treeType != null) {
                          structureEvent = new StructureGrowEvent(location, treeType, false, null, blocks);
-@@ -884,7 +885,7 @@ public interface DispenseItemBehavior {
+@@ -888,7 +889,7 @@ public interface DispenseItemBehavior {
                  CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
  
                  BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D));
@@ -9656,7 +9654,7 @@ index a0c7c6208314d981e8577ad69ef1c5193290a085..f0c2ee38e9101a6c593f6deb6b8101b7
                     worldserver.getCraftServer().getPluginManager().callEvent(event);
                  }
  
-@@ -941,7 +942,7 @@ public interface DispenseItemBehavior {
+@@ -945,7 +946,7 @@ public interface DispenseItemBehavior {
                  CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack.copyWithCount(1)); // Paper - single item in event
  
                  BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
@@ -9665,7 +9663,7 @@ index a0c7c6208314d981e8577ad69ef1c5193290a085..f0c2ee38e9101a6c593f6deb6b8101b7
                      worldserver.getCraftServer().getPluginManager().callEvent(event);
                  }
  
-@@ -990,7 +991,7 @@ public interface DispenseItemBehavior {
+@@ -996,7 +997,7 @@ public interface DispenseItemBehavior {
                  CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack.copyWithCount(1)); // Paper - single item in event
  
                  BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
@@ -9674,7 +9672,7 @@ index a0c7c6208314d981e8577ad69ef1c5193290a085..f0c2ee38e9101a6c593f6deb6b8101b7
                      worldserver.getCraftServer().getPluginManager().callEvent(event);
                  }
  
-@@ -1063,7 +1064,7 @@ public interface DispenseItemBehavior {
+@@ -1070,7 +1071,7 @@ public interface DispenseItemBehavior {
                  CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack.copyWithCount(1)); // Paper - only single item in event
  
                  BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
@@ -10040,10 +10038,10 @@ index c0ea20dcee8bb293df96bc6ee019e50ad6b383fd..b84e9d5ae5efe1a8257a5f1f78a0ab66
  
      private static class InnerUtil { // Attempt to hide these methods from ProtocolLib, so it doesn't accidently pick them up.
 diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
-index 9a49f5271ec1d9de17632bfffe8309cb1ba0d8b1..c06bed93f6a701b1639c1cc334802e7b802431a5 100644
+index c5c734b9eb80d1cdf0e9fd8a043f2b6d1f4cbffe..98fb69a9adeb6eaab199aec127692acb07f56808 100644
 --- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java
 +++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
-@@ -43,7 +43,7 @@ public class PacketUtils {
+@@ -44,7 +44,7 @@ public class PacketUtils {
  
      public static <T extends PacketListener> void ensureRunningOnSameThread(Packet<T> packet, T listener, BlockableEventLoop<?> engine) throws RunningOnDifferentThreadException {
          if (!engine.isSameThread()) {
@@ -10052,7 +10050,7 @@ index 9a49f5271ec1d9de17632bfffe8309cb1ba0d8b1..c06bed93f6a701b1639c1cc334802e7b
                  packetProcessing.push(listener); // Paper - detailed watchdog information
                  try { // Paper - detailed watchdog information
                  if (MinecraftServer.getServer().hasStopped() || (listener instanceof ServerCommonPacketListenerImpl && ((ServerCommonPacketListenerImpl) listener).processedDisconnect)) return; // CraftBukkit, MC-142590
-@@ -77,7 +77,21 @@ public class PacketUtils {
+@@ -91,7 +91,21 @@ public class PacketUtils {
                  }
                  // Paper end - detailed watchdog information
  
@@ -10076,19 +10074,20 @@ index 9a49f5271ec1d9de17632bfffe8309cb1ba0d8b1..c06bed93f6a701b1639c1cc334802e7b
              // CraftBukkit start - SPIGOT-5477, MC-142590
          } else if (MinecraftServer.getServer().hasStopped() || (listener instanceof ServerCommonPacketListenerImpl && ((ServerCommonPacketListenerImpl) listener).processedDisconnect)) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7aeca4e90ac 100644
+index 5ed6c8710b78458031ed6b0273fb2f6a5f482ea7..99a086ed2c0d5615a55539a31b8cd8483569e9c0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -238,7 +238,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -241,8 +241,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      private volatile boolean running;
      private volatile boolean isRestarting = false; // Paper - flag to signify we're attempting to restart
      private boolean stopped;
 -    private int tickCount;
+-    private int ticksUntilAutosave;
 +    // Folia - region threading
      protected final Proxy proxy;
      private boolean onlineMode;
      private boolean preventProxyConnections;
-@@ -287,7 +287,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -293,7 +292,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public OptionSet options;
      public org.bukkit.command.ConsoleCommandSender console;
      //public ConsoleReader reader; // Paper
@@ -10097,7 +10096,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
      public Commands vanillaCommandDispatcher;
-@@ -300,7 +300,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -306,7 +305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public final double[] recentTps = new double[ 3 ];
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
@@ -10106,7 +10105,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
  
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
-@@ -309,6 +309,34 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -315,6 +314,34 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static final long SERVER_INIT = System.nanoTime();
      // Paper end - lag compensation
  
@@ -10141,7 +10140,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
          Thread thread = new io.papermc.paper.util.TickThread(() -> { // Paper - rewrite chunk system
-@@ -594,7 +622,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -640,7 +667,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              worlddata.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());
              this.addLevel(world); // Paper - move up
@@ -10164,7 +10163,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
  
              // Paper - move up
              this.getPlayerList().addWorldborderListener(world);
-@@ -606,6 +648,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -652,6 +693,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.forceDifficulty();
          for (ServerLevel worldserver : this.getAllLevels()) {
              this.prepareLevels(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
@@ -10172,7 +10171,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
              //worldserver.entityManager.tick(); // SPIGOT-6526: Load pending entities so they are available to the API // Paper - rewrite chunk system, not required to "tick" anything
              this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
          }
-@@ -669,7 +712,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -715,7 +757,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              worldProperties.setSpawn(BlockPos.ZERO.above(80), 0.0F);
          } else {
              ServerChunkCache chunkproviderserver = world.getChunkSource();
@@ -10181,7 +10180,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
              // CraftBukkit start
              if (world.generator != null) {
                  Random rand = new Random(world.getSeed());
-@@ -690,6 +733,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -736,6 +778,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              if (i < world.getMinBuildHeight()) {
                  BlockPos blockposition = chunkcoordintpair.getWorldPosition();
  
@@ -10189,25 +10188,25 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
                  i = world.getHeight(Heightmap.Types.WORLD_SURFACE, blockposition.getX() + 8, blockposition.getZ() + 8);
              }
  
-@@ -770,7 +814,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -816,7 +859,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end
  
-         // this.nextTickTime = SystemUtils.getMillis() + 10L;
+         // this.nextTickTimeNanos = SystemUtils.getNanos() + MinecraftServer.PREPARE_LEVELS_DEFAULT_DELAY_NANOS;
 -        this.executeModerately();
 +        //this.executeModerately(); // Folia - region threading
          // Iterator iterator = this.levels.values().iterator();
          }
  
-@@ -793,7 +837,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -839,7 +882,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          // CraftBukkit start
-         // this.nextTickTime = SystemUtils.getMillis() + 10L;
+         // this.nextTickTimeNanos = SystemUtils.getNanos() + MinecraftServer.PREPARE_LEVELS_DEFAULT_DELAY_NANOS;
 -        this.executeModerately();
 +        //this.executeModerately(); // Folia - region threading
          // CraftBukkit end
          if (worldserver.getWorld().getKeepSpawnInMemory()) worldloadlistener.stop(); // Paper
          // CraftBukkit start
-@@ -897,7 +941,37 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -943,7 +986,37 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      // CraftBukkit end
  
@@ -10245,7 +10244,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
          // CraftBukkit start - prevent double stopping on multiple threads
          synchronized(this.stopLock) {
              if (this.hasStopped) return;
-@@ -907,7 +981,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -953,7 +1026,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper start - kill main thread, and kill it hard
          shutdownThread = Thread.currentThread();
          org.spigotmc.WatchdogThread.doStop(); // Paper
@@ -10254,7 +10253,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
              MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PAPER)");
              while (this.getRunningThread().isAlive()) {
                  this.getRunningThread().stop();
-@@ -934,12 +1008,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -980,12 +1053,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.getConnection().stop();
          this.isSaving = true;
          if (this.playerList != null) {
@@ -10276,7 +10275,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
          MinecraftServer.LOGGER.info("Saving worlds");
          Iterator iterator = this.getAllLevels().iterator();
  
-@@ -955,6 +1036,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1001,6 +1081,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.saveAllChunks(false, true, false, true); // Paper - rewrite chunk system - move closing into here
  
          this.isSaving = false;
@@ -10288,7 +10287,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
          this.resources.close();
  
          try {
-@@ -1010,6 +1096,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1056,6 +1141,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
          // Paper end
          this.running = false;
@@ -10296,7 +10295,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
          if (waitForShutdown) {
              try {
                  this.serverThread.join();
-@@ -1091,10 +1178,23 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1137,10 +1223,23 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.statusIcon = (ServerStatus.Favicon) this.loadStatusIcon().orElse(null); // CraftBukkit - decompile error
              this.status = this.buildServerStatus();
  
@@ -10321,18 +10320,18 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
              // this is going to be the first thing the tick process does anyways, so move done and run it after
              // everything is init before watchdog tick.
              // anything at 3+ won't be caught here but also will trip watchdog....
-@@ -1126,8 +1226,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                     this.lastOverloadWarning = this.nextTickTime;
+@@ -1180,8 +1279,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                     }
                  }
- 
+                 // Spigot start
 -                ++MinecraftServer.currentTickLong; // Paper
--                if ( ++MinecraftServer.currentTick % MinecraftServer.SAMPLE_INTERVAL == 0 )
-+                //++MinecraftServer.currentTickLong; // Paper // Folia - threaded regions
-+                if ( false ) // Folia - region threading
+-                if ( ++MinecraftServer.currentTick % MinecraftServer.SAMPLE_INTERVAL == 0 ) // Paper
++                //++MinecraftServer.currentTickLong; // Paper // Folia - region threading
++                if ( false ) // Paper // Folia - region threading
                  {
-                     final long diff = curTime - tickSection;
-                     java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
-@@ -1145,7 +1245,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                     // Paper start
+                     curTime = Util.getNanos();
+@@ -1203,7 +1302,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
                  if (this.debugCommandProfilerDelayStart) {
                      this.debugCommandProfilerDelayStart = false;
@@ -10341,16 +10340,18 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
                  }
  
                  //MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit // Paper - don't overwrite current tick time
-@@ -1153,7 +1253,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 this.nextTickTime += 50L;
+@@ -1211,9 +1310,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                 this.nextTickTimeNanos += i;
                  this.startMetricsRecordingTick();
                  this.profiler.push("tick");
--                this.tickServer(this::haveTime);
-+                this.tickServer(curTime, this.nextTickTime, 0L, null); // Folia - region threading
+-                this.tickServer(flag ? () -> {
+-                    return false;
+-                } : this::haveTime);
++                if (true) throw new UnsupportedOperationException(); // Folia - region threading
                  this.profiler.popPush("nextTickWait");
                  this.mayHaveDelayedTasks = true;
-                 this.delayedTasksMaxNextTickTime = Math.max(Util.getMillis() + 50L, this.nextTickTime);
-@@ -1276,21 +1376,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                 this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
+@@ -1340,21 +1437,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @Override
      public TickTask wrapRunnable(Runnable runnable) {
@@ -10375,15 +10376,82 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
          boolean flag = this.pollTaskInternal();
  
          this.mayHaveDelayedTasks = flag;
-@@ -1298,6 +1393,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1367,33 +1459,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
+     static final long TASK_EXECUTION_FAILURE_BACKOFF = 5L * 1000L; // 5us
+ 
+-    private static long lastMidTickExecute;
+-    private static long lastMidTickExecuteFailure;
+-
+-    private boolean tickMidTickTasks() {
+-        // give all worlds a fair chance at by targetting them all.
+-        // if we execute too many tasks, that's fine - we have logic to correctly handle overuse of allocated time.
+-        boolean executed = false;
+-        for (ServerLevel world : this.getAllLevels()) {
+-            long currTime = System.nanoTime();
+-            if (currTime - world.lastMidTickExecuteFailure <= TASK_EXECUTION_FAILURE_BACKOFF) {
+-                continue;
+-            }
+-            if (!world.getChunkSource().pollTask()) {
+-                // we need to back off if this fails
+-                world.lastMidTickExecuteFailure = currTime;
+-            } else {
+-                executed = true;
+-            }
+-        }
++    // Folia - region threading
+ 
+-        return executed;
++    // Folia start - region threading
++    private boolean tickMidTickTasks(io.papermc.paper.threadedregions.RegionizedWorldData worldData) { // Folia - region threading
++        // Folia - region threading - only execute for one world
++        return worldData.world.getChunkSource().pollTask();
      }
++    // Folia end - region threading
+ 
+     public final void executeMidTickTasks() {
+         org.spigotmc.AsyncCatcher.catchOp("mid tick chunk task execution");
++        io.papermc.paper.threadedregions.RegionizedWorldData worldData = io.papermc.paper.threadedregions.TickRegionScheduler.getCurrentRegionizedWorldData(); // Folia - region threading
+         long startTime = System.nanoTime();
+-        if ((startTime - lastMidTickExecute) <= CHUNK_TASK_QUEUE_BACKOFF_MIN_TIME || (startTime - lastMidTickExecuteFailure) <= TASK_EXECUTION_FAILURE_BACKOFF) {
++        if ((startTime - worldData.lastMidTickExecute) <= CHUNK_TASK_QUEUE_BACKOFF_MIN_TIME || (startTime - worldData.lastMidTickExecuteFailure) <= TASK_EXECUTION_FAILURE_BACKOFF) { // Folia - region threading
+             // it's shown to be bad to constantly hit the queue (chunk loads slow to a crawl), even if no tasks are executed.
+             // so, backoff to prevent this
+             return;
+@@ -1402,13 +1481,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         co.aikar.timings.MinecraftTimings.midTickChunkTasks.startTiming();
+         try {
+             for (;;) {
+-                boolean moreTasks = this.tickMidTickTasks();
++                boolean moreTasks = this.tickMidTickTasks(worldData); // Folia - region threading
+                 long currTime = System.nanoTime();
+                 long diff = currTime - startTime;
+ 
+                 if (!moreTasks || diff >= MAX_CHUNK_EXEC_TIME) {
+                     if (!moreTasks) {
+-                        lastMidTickExecuteFailure = currTime;
++                        worldData.lastMidTickExecuteFailure = currTime; // Folia - region threading
+                     }
+ 
+                     // note: negative values reduce the time
+@@ -1421,7 +1500,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                     double overuseCount = (double)overuse/(double)MAX_CHUNK_EXEC_TIME;
+                     long extraSleep = (long)Math.round(overuseCount*CHUNK_TASK_QUEUE_BACKOFF_MIN_TIME);
+ 
+-                    lastMidTickExecute = currTime + extraSleep;
++                    worldData.lastMidTickExecute = currTime + extraSleep; // Folia - region threading
+                     return;
+                 }
+             }
+@@ -1432,6 +1511,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     // Paper end - execute chunk tasks mid tick
  
      private boolean pollTaskInternal() {
 +        if (true) throw new UnsupportedOperationException(); // Folia - region threading
          if (super.pollTask()) {
              this.executeMidTickTasks(); // Paper - execute chunk tasks mid tick
              return true;
-@@ -1320,6 +1416,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1454,6 +1534,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void doRunTask(TickTask ticktask) { // CraftBukkit - decompile error
@@ -10391,9 +10459,9 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
          this.getProfiler().incrementCounter("runTask");
          super.doRunTask(ticktask);
      }
-@@ -1362,22 +1459,64 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     public void onServerExit() {}
+@@ -1500,43 +1581,85 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         return false;
+     }
  
 -    public void tickServer(BooleanSupplier shouldKeepTicking) {
 +    // Folia start - region threading
@@ -10454,15 +10522,22 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
 +        // Folia end - region threading
  
 -        ++this.tickCount;
+-        this.tickRateManager.tick();
 -        this.tickChildren(shouldKeepTicking);
--        if (i - this.lastServerStatus >= 5000000000L) {
+-        if (i - this.lastServerStatus >= MinecraftServer.STATUS_EXPIRE_TIME_NANOS) {
 +        // Folia - region threading
++        if (region == null) this.tickRateManager.tick(); // Folia - region threading
 +        this.tickChildren(shouldKeepTicking, region); // Folia - region threading
-+        if (region == null && i - this.lastServerStatus >= 5000000000L) { // Folia - region threading - moved to global tick
++        if (region == null && i - this.lastServerStatus >= MinecraftServer.STATUS_EXPIRE_TIME_NANOS) { // Folia - region threading
              this.lastServerStatus = i;
              this.status = this.buildServerStatus();
          }
-@@ -1388,15 +1527,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
+-        --this.ticksUntilAutosave;
++        // Folia - region threading
+         // Paper start - incremental chunk and player saving
+         int playerSaveInterval = io.papermc.paper.configuration.GlobalConfiguration.get().playerAutoSave.rate;
+         if (playerSaveInterval < 0) {
              playerSaveInterval = autosavePeriod;
          }
          this.profiler.push("save");
@@ -10481,7 +10556,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
                  }
              }
          } finally {
-@@ -1406,27 +1545,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1546,31 +1669,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end
          io.papermc.paper.util.CachedLists.reset(); // Paper
          // Paper start - move executeAll() into full server tick timing
@@ -10498,22 +10573,26 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
 +        new com.destroystokyo.paper.event.server.ServerTickEndEvent((int)io.papermc.paper.threadedregions.RegionizedServer.getCurrentTick(), ((double)(endTime - startTime) / 1000000D), remaining).callEvent(); // Folia - region ticking
          // Paper end
          this.profiler.push("tallying");
--        long j = this.tickTimes[this.tickCount % 100] = Util.getNanos() - i;
+-        long j = Util.getNanos() - i;
+-        int k = this.tickCount % 100;
 -
--        this.averageTickTime = this.averageTickTime * 0.8F + (float) j / 1000000.0F * 0.19999999F;
--        long k = Util.getNanos();
+-        this.aggregatedTickTimesNanos -= this.tickTimesNanos[k];
+-        this.aggregatedTickTimesNanos += j;
+-        this.tickTimesNanos[k] = j;
+-        this.smoothedTickTimeMillis = this.smoothedTickTimeMillis * 0.8F + (float) j / (float) TimeUtil.NANOSECONDS_PER_MILLISECOND * 0.19999999F;
+-        long l = Util.getNanos();
 -
 -        // Paper start
 -        tickTimes5s.add(this.tickCount, j);
 -        tickTimes10s.add(this.tickCount, j);
 -        tickTimes60s.add(this.tickCount, j);
 -        // Paper end
--        this.logTickTime(k - i);
+-        this.logTickTime(l - i);
 +        // Folia - region threading
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot
          co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
-@@ -1434,6 +1563,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1603,6 +1712,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      protected void logTickTime(long nanos) {}
  
@@ -10526,7 +10605,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
      private ServerStatus buildServerStatus() {
          ServerStatus.Players serverping_serverpingplayersample = this.buildPlayerStatus();
  
-@@ -1441,7 +1576,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1610,7 +1725,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      private ServerStatus.Players buildPlayerStatus() {
@@ -10535,7 +10614,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
          int i = this.getMaxPlayers();
  
          if (this.hidesOnlinePlayers()) {
-@@ -1462,31 +1597,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1631,31 +1746,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
  
@@ -10573,7 +10652,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
          MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper
          this.profiler.popPush("levels");
          //Iterator iterator = this.getAllLevels().iterator(); // Paper - moved down
-@@ -1494,7 +1616,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1663,7 +1765,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // CraftBukkit start
          // Run tasks that are waiting on processing
          MinecraftTimings.processQueueTimer.startTiming(); // Spigot
@@ -10582,7 +10661,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
              this.processQueue.remove().run();
          }
          MinecraftTimings.processQueueTimer.stopTiming(); // Spigot
-@@ -1502,13 +1624,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1671,13 +1773,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          MinecraftTimings.timeUpdateTimer.startTiming(); // Spigot // Paper
          // Send time updates to everyone, it will get the right time from the world the player is in.
          // Paper start - optimize time updates
@@ -10599,7 +10678,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
                      continue;
                  }
                  ServerPlayer entityplayer = (ServerPlayer) entityhuman;
-@@ -1521,14 +1643,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1690,14 +1792,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end
          MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
  
@@ -10617,7 +10696,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
  
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
-@@ -1545,7 +1664,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1714,7 +1813,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              try {
                  worldserver.timings.doTick.startTiming(); // Spigot
@@ -10626,7 +10705,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
                  // Paper start
                  for (final io.papermc.paper.chunk.SingleThreadChunkRegionManager regionManager : worldserver.getChunkSource().chunkMap.regionManagers) {
                      regionManager.recalculateRegions();
-@@ -1569,17 +1688,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1738,17 +1837,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.profiler.pop();
              this.profiler.pop();
@@ -10637,18 +10716,18 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
 +        if (region == null) this.isIteratingOverLevels = false; // Paper // Folia - region threading
  
          this.profiler.popPush("connection");
-         MinecraftTimings.connectionTimer.startTiming(); // Spigot
+         MinecraftTimings.connectionTimer.startTiming(); // Spigot // Paper
 -        this.getConnection().tick();
 +        if (region == null) this.getConnection().tick(); // Folia - region threading - moved into post entity scheduler tick
-         MinecraftTimings.connectionTimer.stopTiming(); // Spigot
+         MinecraftTimings.connectionTimer.stopTiming(); // Spigot // Paper
          this.profiler.popPush("players");
          MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper
 -        this.playerList.tick();
 +        if (false) this.playerList.tick(); // Folia - region threading
          MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper
-         if (SharedConstants.IS_RUNNING_IN_IDE) {
+         if (SharedConstants.IS_RUNNING_IN_IDE && this.tickRateManager.runsNormally()) {
              GameTestTicker.SINGLETON.tick();
-@@ -1588,7 +1707,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1757,7 +1856,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.profiler.popPush("server gui refresh");
  
          MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper
@@ -10657,7 +10736,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
              ((Runnable) this.tickables.get(i)).run();
          }
          MinecraftTimings.tickablesTimer.stopTiming(); // Spigot // Paper
-@@ -1596,7 +1715,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1765,7 +1864,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.profiler.popPush("send chunks");
          iterator = this.playerList.getPlayers().iterator();
  
@@ -10666,7 +10745,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
              ServerPlayer entityplayer = (ServerPlayer) iterator.next();
  
              entityplayer.connection.chunkSender.sendNextChunks(entityplayer);
-@@ -1939,7 +2058,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2108,7 +2207,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public int getTickCount() {
@@ -10675,7 +10754,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
      }
  
      public int getSpawnProtectionRadius() {
-@@ -1994,6 +2113,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2163,6 +2262,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void invalidateStatus() {
@@ -10691,7 +10770,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
          this.lastServerStatus = 0L;
      }
  
-@@ -2008,6 +2136,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2177,6 +2285,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @Override
      public void executeIfPossible(Runnable runnable) {
@@ -10699,7 +10778,7 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
          if (this.isStopped()) {
              throw new RejectedExecutionException("Server already shutting down");
          } else {
-@@ -2611,14 +2740,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2792,14 +2901,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfileResults stopTimeProfiler() {
@@ -10715,76 +10794,11 @@ index 6758e3ff1100bba2852e44cbb0b38ce4f22490e8..75d5e7f1b247e27f526a3f76fa7df7ae
      }
  
      public int getMaxChainedNeighborUpdates() {
-@@ -2747,33 +2869,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     static final long TASK_EXECUTION_FAILURE_BACKOFF = 5L * 1000L; // 5us
- 
--    private static long lastMidTickExecute;
--    private static long lastMidTickExecuteFailure;
--
--    private boolean tickMidTickTasks() {
--        // give all worlds a fair chance at by targetting them all.
--        // if we execute too many tasks, that's fine - we have logic to correctly handle overuse of allocated time.
--        boolean executed = false;
--        for (ServerLevel world : this.getAllLevels()) {
--            long currTime = System.nanoTime();
--            if (currTime - world.lastMidTickExecuteFailure <= TASK_EXECUTION_FAILURE_BACKOFF) {
--                continue;
--            }
--            if (!world.getChunkSource().pollTask()) {
--                // we need to back off if this fails
--                world.lastMidTickExecuteFailure = currTime;
--            } else {
--                executed = true;
--            }
--        }
-+    // Folia - region threading
- 
--        return executed;
-+    private boolean tickMidTickTasks(io.papermc.paper.threadedregions.RegionizedWorldData worldData) { // Folia - region threading
-+        // Folia - region threading - only execute for one world
-+        return worldData.world.getChunkSource().pollTask();
-     }
- 
-     public final void executeMidTickTasks() {
-         org.spigotmc.AsyncCatcher.catchOp("mid tick chunk task execution");
-+        io.papermc.paper.threadedregions.RegionizedWorldData worldData = io.papermc.paper.threadedregions.TickRegionScheduler.getCurrentRegionizedWorldData(); // Folia - region threading
-         long startTime = System.nanoTime();
--        if ((startTime - lastMidTickExecute) <= CHUNK_TASK_QUEUE_BACKOFF_MIN_TIME || (startTime - lastMidTickExecuteFailure) <= TASK_EXECUTION_FAILURE_BACKOFF) {
-+        if ((startTime - worldData.lastMidTickExecute) <= CHUNK_TASK_QUEUE_BACKOFF_MIN_TIME || (startTime - worldData.lastMidTickExecuteFailure) <= TASK_EXECUTION_FAILURE_BACKOFF) { // Folia - region threading
-             // it's shown to be bad to constantly hit the queue (chunk loads slow to a crawl), even if no tasks are executed.
-             // so, backoff to prevent this
-             return;
-@@ -2782,13 +2889,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         co.aikar.timings.MinecraftTimings.midTickChunkTasks.startTiming();
-         try {
-             for (;;) {
--                boolean moreTasks = this.tickMidTickTasks();
-+                boolean moreTasks = this.tickMidTickTasks(worldData); // Folia - region threading
-                 long currTime = System.nanoTime();
-                 long diff = currTime - startTime;
- 
-                 if (!moreTasks || diff >= MAX_CHUNK_EXEC_TIME) {
-                     if (!moreTasks) {
--                        lastMidTickExecuteFailure = currTime;
-+                        worldData.lastMidTickExecuteFailure = currTime; // Folia - region threading
-                     }
- 
-                     // note: negative values reduce the time
-@@ -2801,7 +2908,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                     double overuseCount = (double)overuse/(double)MAX_CHUNK_EXEC_TIME;
-                     long extraSleep = (long)Math.round(overuseCount*CHUNK_TASK_QUEUE_BACKOFF_MIN_TIME);
- 
--                    lastMidTickExecute = currTime + extraSleep;
-+                    worldData.lastMidTickExecute = currTime + extraSleep; // Folia - region threading
-                     return;
-                 }
-             }
 diff --git a/src/main/java/net/minecraft/server/commands/AdvancementCommands.java b/src/main/java/net/minecraft/server/commands/AdvancementCommands.java
-index 7d116ff3c0cf5c30583c10853940e8897e1d9ca3..90c3347d650113c9b5fa9318cb1b2805295b7cf5 100644
+index 7f2d779986669dcd46fee12cedc03bbad9e91cd3..abd99437d2b368a4fb493fb5fe5278ea4ae41421 100644
 --- a/src/main/java/net/minecraft/server/commands/AdvancementCommands.java
 +++ b/src/main/java/net/minecraft/server/commands/AdvancementCommands.java
-@@ -65,7 +65,11 @@ public class AdvancementCommands {
+@@ -73,7 +73,11 @@ public class AdvancementCommands {
          int i = 0;
  
          for(ServerPlayer serverPlayer : targets) {
@@ -10797,8 +10811,8 @@ index 7d116ff3c0cf5c30583c10853940e8897e1d9ca3..90c3347d650113c9b5fa9318cb1b2805
          }
  
          if (i == 0) {
-@@ -112,9 +116,13 @@ public class AdvancementCommands {
-             throw new CommandRuntimeException(Component.translatable("commands.advancement.criterionNotFound", Advancement.name(advancement), criterion));
+@@ -120,9 +124,13 @@ public class AdvancementCommands {
+             throw ERROR_CRITERION_NOT_FOUND.create(Advancement.name(advancement), criterion);
          } else {
              for(ServerPlayer serverPlayer : targets) {
 +                ++i; // Folia - region threading
@@ -10813,10 +10827,10 @@ index 7d116ff3c0cf5c30583c10853940e8897e1d9ca3..90c3347d650113c9b5fa9318cb1b2805
  
              if (i == 0) {
 diff --git a/src/main/java/net/minecraft/server/commands/AttributeCommand.java b/src/main/java/net/minecraft/server/commands/AttributeCommand.java
-index 506c5a8369ec0b2af3605e5bdfce8b000cf56ec4..efb41b6f138fd45f6b240b1d17c3320d720a2f34 100644
+index 0b054674ce8cb2465dc8658a21ff2ab10c465666..0b6134313f34789a3a245e82f6d1d64903e2817c 100644
 --- a/src/main/java/net/minecraft/server/commands/AttributeCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/AttributeCommand.java
-@@ -92,70 +92,124 @@ public class AttributeCommand {
+@@ -92,25 +92,57 @@ public class AttributeCommand {
          }
      }
  
@@ -10827,20 +10841,18 @@ index 506c5a8369ec0b2af3605e5bdfce8b000cf56ec4..efb41b6f138fd45f6b240b1d17c3320d
 +    // Folia end - region threading
 +
      private static int getAttributeValue(CommandSourceStack source, Entity target, Holder<Attribute> attribute, double multiplier) throws CommandSyntaxException {
--        LivingEntity livingEntity = getEntityWithAttribute(target, attribute);
--        double d = livingEntity.getAttributeValue(attribute);
--        source.sendSuccess(() -> {
--            return Component.translatable("commands.attribute.value.get.success", getAttributeDescription(attribute), target.getName(), d);
--        }, false);
--        return (int)(d * multiplier);
 +        // Folia start - region threading
 +        target.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> {
 +            try {
-+                LivingEntity livingEntity = getEntityWithAttribute(nmsEntity, attribute);
-+                double d = livingEntity.getAttributeValue(attribute);
-+                source.sendSuccess(() -> {
-+                    return Component.translatable("commands.attribute.value.get.success", getAttributeDescription(attribute), nmsEntity.getName(), d);
-+                }, false);
++                // Folia end - region threading
+         LivingEntity livingEntity = getEntityWithAttribute(target, attribute);
+         double d = livingEntity.getAttributeValue(attribute);
+         source.sendSuccess(() -> {
+             return Component.translatable("commands.attribute.value.get.success", getAttributeDescription(attribute), target.getName(), d);
+         }, false);
+-        return (int)(d * multiplier);
++        return; // Folia - region threading
++        // Folia start - region threading
 +            } catch (CommandSyntaxException ex) {
 +                sendMessage(source, ex);
 +            }
@@ -10850,20 +10862,18 @@ index 506c5a8369ec0b2af3605e5bdfce8b000cf56ec4..efb41b6f138fd45f6b240b1d17c3320d
      }
  
      private static int getAttributeBase(CommandSourceStack source, Entity target, Holder<Attribute> attribute, double multiplier) throws CommandSyntaxException {
--        LivingEntity livingEntity = getEntityWithAttribute(target, attribute);
--        double d = livingEntity.getAttributeBaseValue(attribute);
--        source.sendSuccess(() -> {
--            return Component.translatable("commands.attribute.base_value.get.success", getAttributeDescription(attribute), target.getName(), d);
--        }, false);
--        return (int)(d * multiplier);
 +        // Folia start - region threading
 +        target.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> {
 +            try {
-+                LivingEntity livingEntity = getEntityWithAttribute(nmsEntity, attribute);
-+                double d = livingEntity.getAttributeBaseValue(attribute);
-+                source.sendSuccess(() -> {
-+                    return Component.translatable("commands.attribute.base_value.get.success", getAttributeDescription(attribute), nmsEntity.getName(), d);
-+                }, false);
++                // Folia end - region threading
+         LivingEntity livingEntity = getEntityWithAttribute(target, attribute);
+         double d = livingEntity.getAttributeBaseValue(attribute);
+         source.sendSuccess(() -> {
+             return Component.translatable("commands.attribute.base_value.get.success", getAttributeDescription(attribute), target.getName(), d);
+         }, false);
+-        return (int)(d * multiplier);
++        return; // Folia - region threading
++        // Folia start - region threading
 +            } catch (CommandSyntaxException ex) {
 +                sendMessage(source, ex);
 +            }
@@ -10873,30 +10883,21 @@ index 506c5a8369ec0b2af3605e5bdfce8b000cf56ec4..efb41b6f138fd45f6b240b1d17c3320d
      }
  
      private static int getAttributeModifier(CommandSourceStack source, Entity target, Holder<Attribute> attribute, UUID uuid, double multiplier) throws CommandSyntaxException {
--        LivingEntity livingEntity = getEntityWithAttribute(target, attribute);
--        AttributeMap attributeMap = livingEntity.getAttributes();
--        if (!attributeMap.hasModifier(attribute, uuid)) {
--            throw ERROR_NO_SUCH_MODIFIER.create(target.getName(), getAttributeDescription(attribute), uuid);
--        } else {
--            double d = attributeMap.getModifierValue(attribute, uuid);
--            source.sendSuccess(() -> {
--                return Component.translatable("commands.attribute.modifier.value.get.success", uuid, getAttributeDescription(attribute), target.getName(), d);
--            }, false);
--            return (int)(d * multiplier);
--        }
 +        // Folia start - region threading
 +        target.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> {
 +            try {
-+                LivingEntity livingEntity = getEntityWithAttribute(nmsEntity, attribute);
-+                AttributeMap attributeMap = livingEntity.getAttributes();
-+                if (!attributeMap.hasModifier(attribute, uuid)) {
-+                    throw ERROR_NO_SUCH_MODIFIER.create(nmsEntity.getName(), getAttributeDescription(attribute), uuid);
-+                } else {
-+                    double d = attributeMap.getModifierValue(attribute, uuid);
-+                    source.sendSuccess(() -> {
-+                        return Component.translatable("commands.attribute.modifier.value.get.success", uuid, getAttributeDescription(attribute), nmsEntity.getName(), d);
-+                    }, false);
-+                }
++        // Folia end - region threading
+         LivingEntity livingEntity = getEntityWithAttribute(target, attribute);
+         AttributeMap attributeMap = livingEntity.getAttributes();
+         if (!attributeMap.hasModifier(attribute, uuid)) {
+@@ -120,19 +152,40 @@ public class AttributeCommand {
+             source.sendSuccess(() -> {
+                 return Component.translatable("commands.attribute.modifier.value.get.success", Component.translationArg(uuid), getAttributeDescription(attribute), target.getName(), d);
+             }, false);
+-            return (int)(d * multiplier);
++            return; // Folia - region threading
+         }
++        // Folia start - region threading
 +            } catch (CommandSyntaxException ex) {
 +                sendMessage(source, ex);
 +            }
@@ -10906,51 +10907,39 @@ index 506c5a8369ec0b2af3605e5bdfce8b000cf56ec4..efb41b6f138fd45f6b240b1d17c3320d
      }
  
      private static int setAttributeBase(CommandSourceStack source, Entity target, Holder<Attribute> attribute, double value) throws CommandSyntaxException {
--        getAttributeInstance(target, attribute).setBaseValue(value);
--        source.sendSuccess(() -> {
--            return Component.translatable("commands.attribute.base_value.set.success", getAttributeDescription(attribute), target.getName(), value);
--        }, false);
--        return 1;
 +        // Folia start - region threading
 +        target.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> {
 +            try {
-+                getAttributeInstance(nmsEntity, attribute).setBaseValue(value);
-+                source.sendSuccess(() -> {
-+                    return Component.translatable("commands.attribute.base_value.set.success", getAttributeDescription(attribute), nmsEntity.getName(), value);
-+                }, false);
++                // Folia end - region threading
+         getAttributeInstance(target, attribute).setBaseValue(value);
+         source.sendSuccess(() -> {
+             return Component.translatable("commands.attribute.base_value.set.success", getAttributeDescription(attribute), target.getName(), value);
+         }, false);
++                // Folia start - region threading
 +            } catch (CommandSyntaxException ex) {
 +                sendMessage(source, ex);
 +            }
 +        }, null, 1L);
-+        return 0;
 +        // Folia end - region threading
+         return 1;
      }
  
      private static int addModifier(CommandSourceStack source, Entity target, Holder<Attribute> attribute, UUID uuid, String name, double value, AttributeModifier.Operation operation) throws CommandSyntaxException {
--        AttributeInstance attributeInstance = getAttributeInstance(target, attribute);
--        AttributeModifier attributeModifier = new AttributeModifier(uuid, name, value, operation);
--        if (attributeInstance.hasModifier(attributeModifier)) {
--            throw ERROR_MODIFIER_ALREADY_PRESENT.create(target.getName(), getAttributeDescription(attribute), uuid);
--        } else {
--            attributeInstance.addPermanentModifier(attributeModifier);
--            source.sendSuccess(() -> {
--                return Component.translatable("commands.attribute.modifier.add.success", uuid, getAttributeDescription(attribute), target.getName());
--            }, false);
--            return 1;
--        }
 +        // Folia start - region threading
 +        target.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> {
 +            try {
-+                AttributeInstance attributeInstance = getAttributeInstance(nmsEntity, attribute);
-+                AttributeModifier attributeModifier = new AttributeModifier(uuid, name, value, operation);
-+                if (attributeInstance.hasModifier(attributeModifier)) {
-+                    throw ERROR_MODIFIER_ALREADY_PRESENT.create(nmsEntity.getName(), getAttributeDescription(attribute), uuid);
-+                } else {
-+                    attributeInstance.addPermanentModifier(attributeModifier);
-+                    source.sendSuccess(() -> {
-+                        return Component.translatable("commands.attribute.modifier.add.success", uuid, getAttributeDescription(attribute), nmsEntity.getName());
-+                    }, false);
-+                }
++                // Folia end - region threading
+         AttributeInstance attributeInstance = getAttributeInstance(target, attribute);
+         AttributeModifier attributeModifier = new AttributeModifier(uuid, name, value, operation);
+         if (attributeInstance.hasModifier(attributeModifier)) {
+@@ -142,20 +195,38 @@ public class AttributeCommand {
+             source.sendSuccess(() -> {
+                 return Component.translatable("commands.attribute.modifier.add.success", Component.translationArg(uuid), getAttributeDescription(attribute), target.getName());
+             }, false);
+-            return 1;
++            return; // Folia - region threading
+         }
++        // Folia start - region threading
 +            } catch (CommandSyntaxException ex) {
 +                sendMessage(source, ex);
 +            }
@@ -10960,26 +10949,21 @@ index 506c5a8369ec0b2af3605e5bdfce8b000cf56ec4..efb41b6f138fd45f6b240b1d17c3320d
      }
  
      private static int removeModifier(CommandSourceStack source, Entity target, Holder<Attribute> attribute, UUID uuid) throws CommandSyntaxException {
--        AttributeInstance attributeInstance = getAttributeInstance(target, attribute);
--        if (attributeInstance.removePermanentModifier(uuid)) {
--            source.sendSuccess(() -> {
--                return Component.translatable("commands.attribute.modifier.remove.success", uuid, getAttributeDescription(attribute), target.getName());
--            }, false);
--            return 1;
--        } else {
--            throw ERROR_NO_SUCH_MODIFIER.create(target.getName(), getAttributeDescription(attribute), uuid);
--        }
 +        // Folia start - region threading
 +        target.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> {
 +            try {
-+                AttributeInstance attributeInstance = getAttributeInstance(nmsEntity, attribute);
-+                if (attributeInstance.removePermanentModifier(uuid)) {
-+                    source.sendSuccess(() -> {
-+                        return Component.translatable("commands.attribute.modifier.remove.success", uuid, getAttributeDescription(attribute), nmsEntity.getName());
-+                    }, false);
-+                } else {
-+                    throw ERROR_NO_SUCH_MODIFIER.create(nmsEntity.getName(), getAttributeDescription(attribute), uuid);
-+                }
++                // Folia end - region threading
+         AttributeInstance attributeInstance = getAttributeInstance(target, attribute);
+         if (attributeInstance.removePermanentModifier(uuid)) {
+             source.sendSuccess(() -> {
+                 return Component.translatable("commands.attribute.modifier.remove.success", Component.translationArg(uuid), getAttributeDescription(attribute), target.getName());
+             }, false);
+-            return 1;
++            return; // Folia - region threading
+         } else {
+             throw ERROR_NO_SUCH_MODIFIER.create(target.getName(), getAttributeDescription(attribute), uuid);
+         }
++        // Folia start - region threading
 +            } catch (CommandSyntaxException ex) {
 +                sendMessage(source, ex);
 +            }
@@ -10990,7 +10974,7 @@ index 506c5a8369ec0b2af3605e5bdfce8b000cf56ec4..efb41b6f138fd45f6b240b1d17c3320d
  
      private static Component getAttributeDescription(Holder<Attribute> attribute) {
 diff --git a/src/main/java/net/minecraft/server/commands/ClearInventoryCommands.java b/src/main/java/net/minecraft/server/commands/ClearInventoryCommands.java
-index 90c061eaf40ed756dcd56bb877a617a219ea90e1..36f5d081fae92289e1b6bf012018671343dd92a0 100644
+index 3d8076ce2a04c550109fb8f04f2b3d0c76b28795..581172fdd35d8a34c7e5427007981f9d67a21513 100644
 --- a/src/main/java/net/minecraft/server/commands/ClearInventoryCommands.java
 +++ b/src/main/java/net/minecraft/server/commands/ClearInventoryCommands.java
 @@ -46,9 +46,12 @@ public class ClearInventoryCommands {
@@ -11123,7 +11107,7 @@ index ebe50e2e69d346ce9266ed3f180d91ceb58008bd..227acbe74ff009c9275542af734852e3
          }
  
 diff --git a/src/main/java/net/minecraft/server/commands/EnchantCommand.java b/src/main/java/net/minecraft/server/commands/EnchantCommand.java
-index 664cbce2e06fcb95d3d3d6c5302fc9119f938925..3f68902a2842f1dddc73e86ba6278e6b4b39d1dc 100644
+index 37d9c354af887c474094b1a364782007a5f2035d..e4c11fb7872338f684f97a48f95c122514180f4f 100644
 --- a/src/main/java/net/minecraft/server/commands/EnchantCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/EnchantCommand.java
 @@ -46,47 +46,73 @@ public class EnchantCommand {
@@ -11260,30 +11244,33 @@ index 24dfe8e9697331f0d7e67e90b9ca537d7ead575e..30b2dafda64a2e56d53d5d90c3087774
  
          if (i == 0) {
 diff --git a/src/main/java/net/minecraft/server/commands/FillBiomeCommand.java b/src/main/java/net/minecraft/server/commands/FillBiomeCommand.java
-index 618f524a7bba8e5c75445872538c5fd1ceff20e4..87920a58207436b328abff257369a271752df174 100644
+index b920f1c8f48aa8e542028acc125293d603aee7c0..785f9be8e9c66c340e5f8f46386fddfd112685d6 100644
 --- a/src/main/java/net/minecraft/server/commands/FillBiomeCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/FillBiomeCommand.java
-@@ -69,6 +69,12 @@ public class FillBiomeCommand {
-         };
+@@ -80,6 +80,16 @@ public class FillBiomeCommand {
+         });
      }
  
 +    // Folia start - region threading
-+    private static void sendMessage(CommandSourceStack src, CommandSyntaxException ex) {
-+        src.sendFailure((Component)ex.getRawMessage());
++    private static void sendMessage(Consumer<Supplier<Component>> src, Supplier<Either<Integer, CommandSyntaxException>> supplier) {
++        Either<Integer, CommandSyntaxException> either = supplier.get();
++        CommandSyntaxException ex = either == null ? null : either.right().orElse(null);
++        if (ex != null) {
++            src.accept(() -> (Component)ex.getRawMessage());
++        }
 +    }
 +    // Folia end - region threading
 +
-     private static int fill(CommandSourceStack source, BlockPos from, BlockPos to, Holder.Reference<Biome> biome, Predicate<Holder<Biome>> filter) throws CommandSyntaxException {
+     public static Either<Integer, CommandSyntaxException> fill(ServerLevel world, BlockPos from, BlockPos to, Holder<Biome> biome, Predicate<Holder<Biome>> filter, Consumer<Supplier<Component>> feedbackConsumer) {
          BlockPos blockPos = quantize(from);
          BlockPos blockPos2 = quantize(to);
-@@ -79,8 +85,19 @@ public class FillBiomeCommand {
-             throw ERROR_VOLUME_TOO_LARGE.create(j, i);
+@@ -89,8 +99,18 @@ public class FillBiomeCommand {
+         if (i > j) {
+             return Either.right(ERROR_VOLUME_TOO_LARGE.create(j, i));
          } else {
-             ServerLevel serverLevel = source.getLevel();
 +            // Folia start - region threading
-+            int buffer = 0;
-+            // no buffer, we do not touch neighbours
-+            serverLevel.loadChunksAsync(
++            int buffer = 0; // no buffer, we do not touch neighbours
++            world.loadChunksAsync(
 +                (boundingBox.minX() - buffer) >> 4,
 +                (boundingBox.maxX() + buffer) >> 4,
 +                (boundingBox.minZ() - buffer) >> 4,
@@ -11291,27 +11278,26 @@ index 618f524a7bba8e5c75445872538c5fd1ceff20e4..87920a58207436b328abff257369a271
 +                net.minecraft.world.level.chunk.ChunkStatus.FULL,
 +                ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.NORMAL,
 +                (chunks) -> {
-+                    try { // Folia end - region threading
++                    sendMessage(feedbackConsumer, () -> {
              List<ChunkAccess> list = new ArrayList<>();
 -
              for(int k = SectionPos.blockToSectionCoord(boundingBox.minZ()); k <= SectionPos.blockToSectionCoord(boundingBox.maxZ()); ++k) {
                  for(int l = SectionPos.blockToSectionCoord(boundingBox.minX()); l <= SectionPos.blockToSectionCoord(boundingBox.maxX()); ++l) {
-                     ChunkAccess chunkAccess = serverLevel.getChunk(l, k, ChunkStatus.FULL, false);
-@@ -103,7 +120,11 @@ public class FillBiomeCommand {
-             source.sendSuccess(() -> {
+                     ChunkAccess chunkAccess = world.getChunk(l, k, ChunkStatus.FULL, false);
+@@ -114,6 +134,11 @@ public class FillBiomeCommand {
                  return Component.translatable("commands.fillbiome.success.count", mutableInt.getValue(), boundingBox.minX(), boundingBox.minY(), boundingBox.minZ(), boundingBox.maxX(), boundingBox.maxY(), boundingBox.maxZ());
-             }, true);
--            return mutableInt.getValue();
+             });
+             return Either.left(mutableInt.getValue());
 +            // Folia start - region threading
-+               } catch (CommandSyntaxException ex) {
-+                   sendMessage(source, ex);
-+               }
-+            }); return 0; // Folia end - region threading
++                    }); // sendMessage
++                    }); // loadChunksASync
++            return Either.left(Integer.valueOf(0));
++            // Folia end - region threading
          }
      }
- }
+ 
 diff --git a/src/main/java/net/minecraft/server/commands/FillCommand.java b/src/main/java/net/minecraft/server/commands/FillCommand.java
-index e75b08126d9c42d49058fc91d68d1906fc277e8a..cb68b211bc7e5d4e4e68aa8c7d9dd95901b98e5f 100644
+index 287e0b193060829174d9ac7d127c3034c5eee1e1..353dd419f57e923672e065c0b7b27546e12ca7a9 100644
 --- a/src/main/java/net/minecraft/server/commands/FillCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/FillCommand.java
 @@ -57,6 +57,12 @@ public class FillCommand {
@@ -11362,10 +11348,10 @@ index e75b08126d9c42d49058fc91d68d1906fc277e8a..cb68b211bc7e5d4e4e68aa8c7d9dd959
      }
  
 diff --git a/src/main/java/net/minecraft/server/commands/ForceLoadCommand.java b/src/main/java/net/minecraft/server/commands/ForceLoadCommand.java
-index 99250f40978aa3c45df821c3d83f80b541dbb14c..a3ea3fb7ac0f1464ea33e07978ba11c01803dcbe 100644
+index cbcacceb69dd032b70c39075c59cd8d50a77ea17..8ccbb9584bb9aeb8507ba35fd1ce22da936788b5 100644
 --- a/src/main/java/net/minecraft/server/commands/ForceLoadCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/ForceLoadCommand.java
-@@ -49,47 +49,67 @@ public class ForceLoadCommand {
+@@ -49,7 +49,17 @@ public class ForceLoadCommand {
          }))));
      }
  
@@ -11376,30 +11362,23 @@ index 99250f40978aa3c45df821c3d83f80b541dbb14c..a3ea3fb7ac0f1464ea33e07978ba11c0
 +    // Folia end - region threading
 +
      private static int queryForceLoad(CommandSourceStack source, ColumnPos pos) throws CommandSyntaxException {
-         ChunkPos chunkPos = pos.toChunkPos();
-         ServerLevel serverLevel = source.getLevel();
-         ResourceKey<Level> resourceKey = serverLevel.dimension();
--        boolean bl = serverLevel.getForcedChunks().contains(chunkPos.toLong());
--        if (bl) {
--            source.sendSuccess(() -> {
--                return Component.translatable("commands.forceload.query.success", chunkPos, resourceKey.location());
--            }, false);
--            return 1;
--        } else {
--            throw ERROR_NOT_TICKING.create(chunkPos, resourceKey.location());
--        }
 +        // Folia start - region threading
 +        io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> {
 +            try {
-+                boolean bl = serverLevel.getForcedChunks().contains(chunkPos.toLong());
-+                if (bl) {
-+                    source.sendSuccess(() -> {
-+                        return Component.translatable("commands.forceload.query.success", chunkPos, resourceKey.location());
-+                    }, false);
-+                    return;
-+                } else {
-+                    throw ERROR_NOT_TICKING.create(chunkPos, resourceKey.location());
-+                }
++        // Folia end - region threading
+         ChunkPos chunkPos = pos.toChunkPos();
+         ServerLevel serverLevel = source.getLevel();
+         ResourceKey<Level> resourceKey = serverLevel.dimension();
+@@ -58,14 +68,22 @@ public class ForceLoadCommand {
+             source.sendSuccess(() -> {
+                 return Component.translatable("commands.forceload.query.success", Component.translationArg(chunkPos), Component.translationArg(resourceKey.location()));
+             }, false);
+-            return 1;
++            return; // Folia - region threading
+         } else {
+             throw ERROR_NOT_TICKING.create(chunkPos, resourceKey.location());
+         }
++        // Folia start - region threading
 +            } catch (CommandSyntaxException ex) {
 +                sendMessage(source, ex);
 +            }
@@ -11410,44 +11389,18 @@ index 99250f40978aa3c45df821c3d83f80b541dbb14c..a3ea3fb7ac0f1464ea33e07978ba11c0
  
      private static int listForceLoad(CommandSourceStack source) {
          ServerLevel serverLevel = source.getLevel();
++        io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> { // Folia - region threading
          ResourceKey<Level> resourceKey = serverLevel.dimension();
--        LongSet longSet = serverLevel.getForcedChunks();
--        int i = longSet.size();
--        if (i > 0) {
--            String string = Joiner.on(", ").join(longSet.stream().sorted().map(ChunkPos::new).map(ChunkPos::toString).iterator());
--            if (i == 1) {
--                source.sendSuccess(() -> {
--                    return Component.translatable("commands.forceload.list.single", resourceKey.location(), string);
--                }, false);
-+        // Folia start - region threading
-+        io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> {
-+            LongSet longSet = serverLevel.getForcedChunks();
-+            int i = longSet.size();
-+            if (i > 0) {
-+                String string = Joiner.on(", ").join(longSet.stream().sorted().map(ChunkPos::new).map(ChunkPos::toString).iterator());
-+                if (i == 1) {
-+                    source.sendSuccess(() -> {
-+                        return Component.translatable("commands.forceload.list.single", resourceKey.location(), string);
-+                    }, false);
-+                } else {
-+                    source.sendSuccess(() -> {
-+                        return Component.translatable("commands.forceload.list.multiple", i, resourceKey.location(), string);
-+                    }, false);
-+                }
-             } else {
--                source.sendSuccess(() -> {
--                    return Component.translatable("commands.forceload.list.multiple", i, resourceKey.location(), string);
--                }, false);
-+                source.sendFailure(Component.translatable("commands.forceload.added.none", resourceKey.location()));
-             }
--        } else {
--            source.sendFailure(Component.translatable("commands.forceload.added.none", resourceKey.location()));
--        }
+         LongSet longSet = serverLevel.getForcedChunks();
+         int i = longSet.size();
+@@ -83,13 +101,15 @@ public class ForceLoadCommand {
+         } else {
+             source.sendFailure(Component.translatable("commands.forceload.added.none", Component.translationArg(resourceKey.location())));
+         }
++        }); // Folia - region threading
  
 -        return i;
-+        });
-+        return 1;
-+        // Folia end - region threading
++        return 1; // Folia - region threading
      }
  
      private static int removeAll(CommandSourceStack source) {
@@ -11457,118 +11410,37 @@ index 99250f40978aa3c45df821c3d83f80b541dbb14c..a3ea3fb7ac0f1464ea33e07978ba11c0
          LongSet longSet = serverLevel.getForcedChunks();
          longSet.forEach((chunkPos) -> {
              serverLevel.setChunkForced(ChunkPos.getX(chunkPos), ChunkPos.getZ(chunkPos), false);
-@@ -97,61 +117,71 @@ public class ForceLoadCommand {
+@@ -97,10 +117,15 @@ public class ForceLoadCommand {
          source.sendSuccess(() -> {
-             return Component.translatable("commands.forceload.removed.all", resourceKey.location());
+             return Component.translatable("commands.forceload.removed.all", Component.translationArg(resourceKey.location()));
          }, true);
 +        }); // Folia - region threading
          return 0;
      }
  
      private static int changeForceLoad(CommandSourceStack source, ColumnPos from, ColumnPos to, boolean forceLoaded) throws CommandSyntaxException {
--        int i = Math.min(from.x(), to.x());
--        int j = Math.min(from.z(), to.z());
--        int k = Math.max(from.x(), to.x());
--        int l = Math.max(from.z(), to.z());
--        if (i >= -30000000 && j >= -30000000 && k < 30000000 && l < 30000000) {
--            int m = SectionPos.blockToSectionCoord(i);
--            int n = SectionPos.blockToSectionCoord(j);
--            int o = SectionPos.blockToSectionCoord(k);
--            int p = SectionPos.blockToSectionCoord(l);
--            long q = ((long)(o - m) + 1L) * ((long)(p - n) + 1L);
--            if (q > 256L) {
--                throw ERROR_TOO_MANY_CHUNKS.create(256, q);
--            } else {
--                ServerLevel serverLevel = source.getLevel();
--                ResourceKey<Level> resourceKey = serverLevel.dimension();
--                ChunkPos chunkPos = null;
--                int r = 0;
 +        // Folia start - region threading
 +        io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> {
 +            try {
-+                int i = Math.min(from.x(), to.x());
-+                int j = Math.min(from.z(), to.z());
-+                int k = Math.max(from.x(), to.x());
-+                int l = Math.max(from.z(), to.z());
-+                if (i >= -30000000 && j >= -30000000 && k < 30000000 && l < 30000000) {
-+                    int m = SectionPos.blockToSectionCoord(i);
-+                    int n = SectionPos.blockToSectionCoord(j);
-+                    int o = SectionPos.blockToSectionCoord(k);
-+                    int p = SectionPos.blockToSectionCoord(l);
-+                    long q = ((long)(o - m) + 1L) * ((long)(p - n) + 1L);
-+                    if (q > 256L) {
-+                        throw ERROR_TOO_MANY_CHUNKS.create(256, q);
-+                    } else {
-+                        ServerLevel serverLevel = source.getLevel();
-+                        ResourceKey<Level> resourceKey = serverLevel.dimension();
-+                        ChunkPos chunkPos = null;
-+                        int r = 0;
- 
--                for(int s = m; s <= o; ++s) {
--                    for(int t = n; t <= p; ++t) {
--                        boolean bl = serverLevel.setChunkForced(s, t, forceLoaded);
--                        if (bl) {
--                            ++r;
--                            if (chunkPos == null) {
--                                chunkPos = new ChunkPos(s, t);
-+                        for(int s = m; s <= o; ++s) {
-+                            for(int t = n; t <= p; ++t) {
-+                                boolean bl = serverLevel.setChunkForced(s, t, forceLoaded);
-+                                if (bl) {
-+                                    ++r;
-+                                    if (chunkPos == null) {
-+                                        chunkPos = new ChunkPos(s, t);
-+                                    }
-+                                }
-                             }
-                         }
--                    }
--                }
- 
--                ChunkPos chunkPos2 = chunkPos;
--                if (r == 0) {
--                    throw (forceLoaded ? ERROR_ALL_ADDED : ERROR_NONE_REMOVED).create();
--                } else {
--                    if (r == 1) {
--                        source.sendSuccess(() -> {
--                            return Component.translatable("commands.forceload." + (forceLoaded ? "added" : "removed") + ".single", chunkPos2, resourceKey.location());
--                        }, true);
--                    } else {
--                        ChunkPos chunkPos3 = new ChunkPos(m, n);
--                        ChunkPos chunkPos4 = new ChunkPos(o, p);
--                        source.sendSuccess(() -> {
--                            return Component.translatable("commands.forceload." + (forceLoaded ? "added" : "removed") + ".multiple", chunkPos2, resourceKey.location(), chunkPos3, chunkPos4);
--                        }, true);
--                    }
-+                        ChunkPos chunkPos2 = chunkPos;
-+                        if (r == 0) {
-+                            throw (forceLoaded ? ERROR_ALL_ADDED : ERROR_NONE_REMOVED).create();
-+                        } else {
-+                            if (r == 1) {
-+                                source.sendSuccess(() -> {
-+                                    return Component.translatable("commands.forceload." + (forceLoaded ? "added" : "removed") + ".single", chunkPos2, resourceKey.location());
-+                                }, true);
-+                            } else {
-+                                ChunkPos chunkPos3 = new ChunkPos(m, n);
-+                                ChunkPos chunkPos4 = new ChunkPos(o, p);
-+                                source.sendSuccess(() -> {
-+                                    return Component.translatable("commands.forceload." + (forceLoaded ? "added" : "removed") + ".multiple", chunkPos2, resourceKey.location(), chunkPos3, chunkPos4);
-+                                }, true);
-+                            }
++        // Folia end - region threading
+         int i = Math.min(from.x(), to.x());
+         int j = Math.min(from.z(), to.z());
+         int k = Math.max(from.x(), to.x());
+@@ -147,11 +172,18 @@ public class ForceLoadCommand {
+                         }, true);
+                     }
  
 -                    return r;
-+                            return;
-+                        }
-+                    }
-+                } else {
-+                    throw BlockPosArgument.ERROR_OUT_OF_WORLD.create();
++                    return; // Folia - region threading
                  }
+             }
+         } else {
+             throw BlockPosArgument.ERROR_OUT_OF_WORLD.create();
+         }
++        // Folia start - region threading
 +            } catch (CommandSyntaxException ex) {
 +                sendMessage(source, ex);
-             }
--        } else {
--            throw BlockPosArgument.ERROR_OUT_OF_WORLD.create();
--        }
++            }
 +        });
 +        return 1;
 +        // Folia end - region threading
@@ -11634,7 +11506,7 @@ index 0026da50714adca207b1d3970ee808c9c09d4443..ac694041183e49ab44c5a27f3aa57ad1
  
          if (targets.size() == 1) {
 diff --git a/src/main/java/net/minecraft/server/commands/PlaceCommand.java b/src/main/java/net/minecraft/server/commands/PlaceCommand.java
-index 1ca63d5504999eb63bece58e697fe42732bcdb7e..02a9fb1c3d9b94cda8f60f044245d44ce90d35dc 100644
+index a78ac2c2a536abb0a77371c3d8a9ce0dc5084c38..4f0c962231562c13be8980f98a7d801ab292ab38 100644
 --- a/src/main/java/net/minecraft/server/commands/PlaceCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/PlaceCommand.java
 @@ -88,12 +88,25 @@ public class PlaceCommand {
@@ -11754,7 +11626,7 @@ index 1ca63d5504999eb63bece58e697fe42732bcdb7e..02a9fb1c3d9b94cda8f60f044245d44c
          Optional optional;
 @@ -180,9 +238,17 @@ public class PlaceCommand {
                  source.sendSuccess(() -> {
-                     return Component.translatable("commands.place.template.success", id, pos.getX(), pos.getY(), pos.getZ());
+                     return Component.translatable("commands.place.template.success", Component.translationArg(id), pos.getX(), pos.getY(), pos.getZ());
                  }, true);
 -                return 1;
 +                return; // Folia - region threading
@@ -12041,8 +11913,185 @@ index 8f5714221bc32fb2c9201cbc8a0a35610977f574..c78a7e5e5c6b012756e6a1e50159dd97
          return duration;
      }
  }
+diff --git a/src/main/java/net/minecraft/server/commands/WorldBorderCommand.java b/src/main/java/net/minecraft/server/commands/WorldBorderCommand.java
+index 812f2adc6fc20aa126e629284fe594a923b24540..0a5e6961fb37e9a53cd39b1bd233e0204986b244 100644
+--- a/src/main/java/net/minecraft/server/commands/WorldBorderCommand.java
++++ b/src/main/java/net/minecraft/server/commands/WorldBorderCommand.java
+@@ -56,7 +56,17 @@ public class WorldBorderCommand {
+         })))));
+     }
+ 
++    // Folia start - region threading
++    private static void sendMessage(CommandSourceStack src, CommandSyntaxException ex) {
++        src.sendFailure((Component)ex.getRawMessage());
++    }
++    // Folia end - region threading
++
+     private static int setDamageBuffer(CommandSourceStack source, float distance) throws CommandSyntaxException {
++        // Folia start - region threading
++        io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> {
++            try {
++                // Folia end - region threading
+         WorldBorder worldborder = source.getLevel().getWorldBorder(); // CraftBukkit
+ 
+         if (worldborder.getDamageSafeZone() == (double) distance) {
+@@ -66,11 +76,22 @@ public class WorldBorderCommand {
+             source.sendSuccess(() -> {
+                 return Component.translatable("commands.worldborder.damage.buffer.success", String.format(Locale.ROOT, "%.2f", distance));
+             }, true);
+-            return (int) distance;
++            return; // Folia - region threading
+         }
++        // Folia start - region threading
++            } catch (CommandSyntaxException ex) {
++                sendMessage(source, ex);
++            }
++        });
++        return 1;
++        // Folia end - region threading
+     }
+ 
+     private static int setDamageAmount(CommandSourceStack source, float damagePerBlock) throws CommandSyntaxException {
++        // Folia start - region threading
++        io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> {
++            try {
++                // Folia end - region threading
+         WorldBorder worldborder = source.getLevel().getWorldBorder(); // CraftBukkit
+ 
+         if (worldborder.getDamagePerBlock() == (double) damagePerBlock) {
+@@ -80,11 +101,22 @@ public class WorldBorderCommand {
+             source.sendSuccess(() -> {
+                 return Component.translatable("commands.worldborder.damage.amount.success", String.format(Locale.ROOT, "%.2f", damagePerBlock));
+             }, true);
+-            return (int) damagePerBlock;
++            return; // Folia - region threading
+         }
++        // Folia start - region threading
++            } catch (CommandSyntaxException ex) {
++                sendMessage(source, ex);
++            }
++        });
++        return 1;
++        // Folia end - region threading
+     }
+ 
+     private static int setWarningTime(CommandSourceStack source, int time) throws CommandSyntaxException {
++        // Folia start - region threading
++        io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> {
++            try {
++                // Folia end - region threading
+         WorldBorder worldborder = source.getLevel().getWorldBorder(); // CraftBukkit
+ 
+         if (worldborder.getWarningTime() == time) {
+@@ -94,11 +126,22 @@ public class WorldBorderCommand {
+             source.sendSuccess(() -> {
+                 return Component.translatable("commands.worldborder.warning.time.success", time);
+             }, true);
+-            return time;
++            return; // Folia - region threading
+         }
++        // Folia start - region threading
++            } catch (CommandSyntaxException ex) {
++                sendMessage(source, ex);
++            }
++        });
++        return 1;
++        // Folia end - region threading
+     }
+ 
+     private static int setWarningDistance(CommandSourceStack source, int distance) throws CommandSyntaxException {
++        // Folia start - region threading
++        io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> {
++            try {
++                // Folia end - region threading
+         WorldBorder worldborder = source.getLevel().getWorldBorder(); // CraftBukkit
+ 
+         if (worldborder.getWarningBlocks() == distance) {
+@@ -108,20 +151,38 @@ public class WorldBorderCommand {
+             source.sendSuccess(() -> {
+                 return Component.translatable("commands.worldborder.warning.distance.success", distance);
+             }, true);
+-            return distance;
++            return; // Folia - region threading
+         }
++        // Folia start - region threading
++            } catch (CommandSyntaxException ex) {
++                sendMessage(source, ex);
++            }
++        });
++        return 1;
++        // Folia end - region threading
+     }
+ 
+     private static int getSize(CommandSourceStack source) {
++        // Folia start - region threading
++        io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> {
++                // Folia end - region threading
+         double d0 = source.getLevel().getWorldBorder().getSize(); // CraftBukkit
+ 
+         source.sendSuccess(() -> {
+             return Component.translatable("commands.worldborder.get", String.format(Locale.ROOT, "%.0f", d0));
+         }, false);
+-        return Mth.floor(d0 + 0.5D);
++        return; // Folia - region threading
++        // Folia start - region threading
++        });
++        return 1;
++        // Folia end - region threading
+     }
+ 
+     private static int setCenter(CommandSourceStack source, Vec2 pos) throws CommandSyntaxException {
++        // Folia start - region threading
++        io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> {
++            try {
++                // Folia end - region threading
+         WorldBorder worldborder = source.getLevel().getWorldBorder(); // CraftBukkit
+ 
+         if (worldborder.getCenterX() == (double) pos.x && worldborder.getCenterZ() == (double) pos.y) {
+@@ -131,13 +192,24 @@ public class WorldBorderCommand {
+             source.sendSuccess(() -> {
+                 return Component.translatable("commands.worldborder.center.success", String.format(Locale.ROOT, "%.2f", pos.x), String.format(Locale.ROOT, "%.2f", pos.y));
+             }, true);
+-            return 0;
++            return; // Folia - region threading
+         } else {
+             throw WorldBorderCommand.ERROR_TOO_FAR_OUT.create();
+         }
++        // Folia start - region threading
++            } catch (CommandSyntaxException ex) {
++                sendMessage(source, ex);
++            }
++        });
++        return 1;
++        // Folia end - region threading
+     }
+ 
+     private static int setSize(CommandSourceStack source, double distance, long time) throws CommandSyntaxException {
++        // Folia start - region threading
++        io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> {
++            try {
++                // Folia end - region threading
+         WorldBorder worldborder = source.getLevel().getWorldBorder(); // CraftBukkit
+         double d1 = worldborder.getSize();
+ 
+@@ -166,7 +238,14 @@ public class WorldBorderCommand {
+                 }, true);
+             }
+ 
+-            return (int) (distance - d1);
++            return; // Folia - region threading
+         }
++        // Folia start - region threading
++            } catch (CommandSyntaxException ex) {
++                sendMessage(source, ex);
++            }
++        });
++        return 1;
++        // Folia end - region threading
+     }
+ }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index cf605aa56adf7f80d3b409f60a92a5ca7ae8fd07..05d8cabd2294456e3c8df60265f8b035990dd896 100644
+index 58536aabf607015939a1326f80207c0a06eed8ff..12af517a7dd8c0bb2bc55ab3eb0e68a074011bb5 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -442,9 +442,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -12058,7 +12107,7 @@ index cf605aa56adf7f80d3b409f60a92a5ca7ae8fd07..05d8cabd2294456e3c8df60265f8b035
      }
  
      @Override
-@@ -765,7 +765,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -766,7 +766,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          Waitable[] waitableArray = new Waitable[1]; // Paper
          rconConsoleSource.prepareForCommand();
          final java.util.concurrent.atomic.AtomicReference<String> command = new java.util.concurrent.atomic.AtomicReference<>(s); // Paper
@@ -12067,7 +12116,7 @@ index cf605aa56adf7f80d3b409f60a92a5ca7ae8fd07..05d8cabd2294456e3c8df60265f8b035
              CommandSourceStack wrapper = rconConsoleSource.createCommandSourceStack();
              RemoteServerCommandEvent event = new RemoteServerCommandEvent(rconConsoleSource.getBukkitSender(wrapper), s);
              this.server.getPluginManager().callEvent(event);
-@@ -789,7 +789,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -790,7 +790,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              ConsoleInput serverCommand = new ConsoleInput(event.getCommand(), wrapper);
              this.server.dispatchServerCommand(event.getSender(), serverCommand);
              } // Paper
@@ -12731,10 +12780,10 @@ index 55f96545d6db95e3e657502a7910d96fded1113e..b39dd5a11a34407244666d8b9c1e775d
  
      public String getDebugStatus() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 8c33a12ca879c46893150d6adfb8aa4d397c6b4c..4ed40924942bc3252fb1a533190765fbfdb2ba72 100644
+index 6e212f672579a3e08dc362c287be59ca5170d717..a363c9d74d2a50a3bb3c3e323f7cf921c50bbff7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -60,73 +60,42 @@ public class ServerChunkCache extends ChunkSource {
+@@ -58,73 +58,42 @@ public class ServerChunkCache extends ChunkSource {
      public final ServerChunkCache.MainThreadExecutor mainThreadProcessor;
      public final ChunkMap chunkMap;
      private final DimensionDataStorage dataStorage;
@@ -12820,7 +12869,7 @@ index 8c33a12ca879c46893150d6adfb8aa4d397c6b4c..4ed40924942bc3252fb1a533190765fb
      }
  
      public final LevelChunk getChunkAtIfLoadedMainThreadNoCache(int x, int z) {
-@@ -163,8 +132,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -161,8 +130,7 @@ public class ServerChunkCache extends ChunkSource {
          this.distanceManager.removeTicket(ticketType, chunkPos, ticketLevel, identifier);
      }
  
@@ -12830,7 +12879,7 @@ index 8c33a12ca879c46893150d6adfb8aa4d397c6b4c..4ed40924942bc3252fb1a533190765fb
      // Paper end
  
      public ServerChunkCache(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor workerExecutor, ChunkGenerator chunkGenerator, int viewDistance, int simulationDistance, boolean dsync, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier<DimensionDataStorage> persistentStateManagerFactory) {
-@@ -238,26 +206,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -236,26 +204,7 @@ public class ServerChunkCache extends ChunkSource {
      public LevelChunk getChunkAtIfLoadedImmediately(int x, int z) {
          long k = ChunkPos.asLong(x, z);
  
@@ -12858,7 +12907,7 @@ index 8c33a12ca879c46893150d6adfb8aa4d397c6b4c..4ed40924942bc3252fb1a533190765fb
      }
      // Paper end
  
-@@ -331,6 +280,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -329,6 +278,7 @@ public class ServerChunkCache extends ChunkSource {
      }
  
      public CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> getChunkFuture(int chunkX, int chunkZ, ChunkStatus leastStatus, boolean create) {
@@ -12866,62 +12915,22 @@ index 8c33a12ca879c46893150d6adfb8aa4d397c6b4c..4ed40924942bc3252fb1a533190765fb
          boolean flag1 = io.papermc.paper.util.TickThread.isTickThread(); // Paper - rewrite chunk system
          CompletableFuture completablefuture;
  
-@@ -508,10 +458,11 @@ public class ServerChunkCache extends ChunkSource {
+@@ -507,10 +457,11 @@ public class ServerChunkCache extends ChunkSource {
      }
  
      private void tickChunks() {
-+        io.papermc.paper.threadedregions.RegionizedWorldData regionizedWorldData = this.level.getCurrentWorldData(); // Folia - region threading
-         long i = this.level.getGameTime();
+-        long i = this.level.getGameTime();
 -        long j = i - this.lastInhabitedUpdate;
++        io.papermc.paper.threadedregions.RegionizedWorldData regionizedWorldData = this.level.getCurrentWorldData(); // Folia - region threading
++        //long i = this.level.getGameTime(); // Folia - region threading
 +        long j = 1; // Folia - region threading
  
 -        this.lastInhabitedUpdate = i;
 +        //this.lastInhabitedUpdate = i; // Folia - region threading
-         boolean flag = this.level.isDebug();
+         if (!this.level.isDebug()) {
+             ProfilerFiller gameprofilerfiller = this.level.getProfiler();
  
-         if (flag) {
-@@ -522,7 +473,7 @@ public class ServerChunkCache extends ChunkSource {
- 
-             gameprofilerfiller.push("pollingChunks");
-             int k = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
--            boolean flag1 = this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
-+            boolean flag1 = this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && this.level.getRedstoneGameTime() % this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit // Folia - region threading
- 
-             gameprofilerfiller.push("naturalSpawnCount");
-             this.level.timings.countNaturalMobs.startTiming(); // Paper - timings
-@@ -531,7 +482,7 @@ public class ServerChunkCache extends ChunkSource {
-             NaturalSpawner.SpawnState spawnercreature_d; // moved down
-             if ((this.spawnFriendlies || this.spawnEnemies) && this.level.paperConfig().entities.spawning.perPlayerMobSpawns) { // don't count mobs when animals and monsters are disabled
-                 // re-set mob counts
--                for (ServerPlayer player : this.level.players) {
-+                for (ServerPlayer player : regionizedWorldData.getLocalPlayers()) { // Folia - region threading
-                     // Paper start - per player mob spawning backoff
-                     for (int ii = 0; ii < ServerPlayer.MOBCATEGORY_TOTAL_ENUMS; ii++) {
-                         player.mobCounts[ii] = 0;
-@@ -544,14 +495,14 @@ public class ServerChunkCache extends ChunkSource {
-                     }
-                     // Paper end - per player mob spawning backoff
-                 }
--                spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
-+                spawnercreature_d = NaturalSpawner.createState(l, regionizedWorldData.getLoadedEntities(), this::getFullChunk, null, true); // Folia - region threading
-             } else {
--                spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, !this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new LocalMobCapCalculator(this.chunkMap) : null, false);
-+                spawnercreature_d = NaturalSpawner.createState(l, regionizedWorldData.getLoadedEntities(), this::getFullChunk, !this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new LocalMobCapCalculator(this.chunkMap) : null, false); // Folia - region threading
-             }
-             // Paper end
-             this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
- 
--            this.lastSpawnState = spawnercreature_d;
-+            regionizedWorldData.lastSpawnState = spawnercreature_d; // Folia - region threading
-             gameprofilerfiller.popPush("filteringLoadedChunks");
-             // Paper - optimise chunk tick iteration
-             // Paper - optimise chunk tick iteration
-@@ -560,13 +511,13 @@ public class ServerChunkCache extends ChunkSource {
-             // Paper - optimise chunk tick iteration
- 
-             gameprofilerfiller.popPush("spawnAndTick");
--            boolean flag2 = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
-+            boolean flag2 = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !regionizedWorldData.getLocalPlayers().isEmpty(); // CraftBukkit // Folia - region threading
+@@ -520,9 +471,9 @@ public class ServerChunkCache extends ChunkSource {
  
              // Paper start - optimise chunk tick iteration
              ChunkMap playerChunkMap = this.chunkMap;
@@ -12933,7 +12942,7 @@ index 8c33a12ca879c46893150d6adfb8aa4d397c6b4c..4ed40924942bc3252fb1a533190765fb
                      player.playerNaturallySpawnedEvent = null;
                      player.lastEntitySpawnRadiusSquared = -1.0;
                      continue;
-@@ -582,7 +533,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -538,7 +489,7 @@ public class ServerChunkCache extends ChunkSource {
                  com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent event = new com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent(player.getBukkitEntity(), (byte)chunkRange);
                  event.callEvent();
                  if (event.isCancelled() || event.getSpawnRadius() < 0) {
@@ -12942,7 +12951,7 @@ index 8c33a12ca879c46893150d6adfb8aa4d397c6b4c..4ed40924942bc3252fb1a533190765fb
                      player.playerNaturallySpawnedEvent = null;
                      player.lastEntitySpawnRadiusSquared = -1.0;
                      continue;
-@@ -592,7 +543,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -548,7 +499,7 @@ public class ServerChunkCache extends ChunkSource {
                  int chunkX = io.papermc.paper.util.CoordinateUtils.getChunkCoordinate(player.getX());
                  int chunkZ = io.papermc.paper.util.CoordinateUtils.getChunkCoordinate(player.getZ());
  
@@ -12951,21 +12960,82 @@ index 8c33a12ca879c46893150d6adfb8aa4d397c6b4c..4ed40924942bc3252fb1a533190765fb
                  player.lastEntitySpawnRadiusSquared = (double)((range << 4) * (range << 4)); // used in anyPlayerCloseEnoughForSpawning
                  player.playerNaturallySpawnedEvent = event;
              }
-@@ -603,10 +554,10 @@ public class ServerChunkCache extends ChunkSource {
-             io.papermc.paper.util.player.NearbyPlayers nearbyPlayers = this.chunkMap.getNearbyPlayers(); // Paper - optimise chunk tick iteration
-             Iterator<LevelChunk> iterator1;
-             if (this.level.paperConfig().entities.spawning.perPlayerMobSpawns) {
--                iterator1 = this.tickingChunks.iterator();
-+                iterator1 = regionizedWorldData.getTickingChunks().iterator(); // Folia - region threading
-             } else {
--                iterator1 = this.tickingChunks.unsafeIterator();
--                List<LevelChunk> shuffled = Lists.newArrayListWithCapacity(this.tickingChunks.size());
-+                iterator1 = regionizedWorldData.getTickingChunks().unsafeIterator(); // Folia - region threading
-+                List<LevelChunk> shuffled = Lists.newArrayListWithCapacity(regionizedWorldData.getTickingChunks().size()); // Folia - region threading
-                 while (iterator1.hasNext()) {
-                     shuffled.add(iterator1.next());
+@@ -563,7 +514,7 @@ public class ServerChunkCache extends ChunkSource {
+                 NaturalSpawner.SpawnState spawnercreature_d; // moved down
+                 if ((this.spawnFriendlies || this.spawnEnemies) && this.level.paperConfig().entities.spawning.perPlayerMobSpawns) { // don't count mobs when animals and monsters are disabled
+                     // re-set mob counts
+-                    for (ServerPlayer player : this.level.players) {
++                    for (ServerPlayer player : this.level.getLocalPlayers()) { // Folia - region threading
+                         // Paper start - per player mob spawning backoff
+                         for (int ii = 0; ii < ServerPlayer.MOBCATEGORY_TOTAL_ENUMS; ii++) {
+                             player.mobCounts[ii] = 0;
+@@ -576,21 +527,21 @@ public class ServerChunkCache extends ChunkSource {
+                         }
+                         // Paper end - per player mob spawning backoff
+                     }
+-                    spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true);
++                    spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, regionizedWorldData.getLoadedEntities(), this::getFullChunk, null, true); // Folia - region threading - note: function only cares about loaded entities, doesn't need all
+                 } else {
+-                    spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, !this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new LocalMobCapCalculator(this.chunkMap) : null, false);
++                    spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, regionizedWorldData.getLoadedEntities(), this::getFullChunk, !this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new LocalMobCapCalculator(this.chunkMap) : null, false); // Folia - region threading - note: function only cares about loaded entities, doesn't need all
                  }
-@@ -673,17 +624,21 @@ public class ServerChunkCache extends ChunkSource {
+                 // Paper end
+                 this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
+ 
+-                this.lastSpawnState = spawnercreature_d;
++                regionizedWorldData.lastSpawnState = spawnercreature_d; // Folia - region threading
+                 gameprofilerfiller.popPush("spawnAndTick");
+-                boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
++                boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.getLocalPlayers().isEmpty(); // CraftBukkit // Folia - region threadin
+ 
+                 // Paper start - optimise chunk tick iteration
+-                for (ServerPlayer player : this.level.players) {
++                for (ServerPlayer player : this.level.getLocalPlayers()) { // Folia - region threading
+                     if (!player.affectsSpawning || player.isSpectator()) {
+-                        playerChunkMap.playerMobSpawnMap.remove(player);
++                        regionizedWorldData.mobSpawnMap.remove(player); // Folia - region threading
+                         player.playerNaturallySpawnedEvent = null;
+                         player.lastEntitySpawnRadiusSquared = -1.0;
+                         continue;
+@@ -606,7 +557,7 @@ public class ServerChunkCache extends ChunkSource {
+                     com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent event = new com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent(player.getBukkitEntity(), (byte)chunkRange);
+                     event.callEvent();
+                     if (event.isCancelled() || event.getSpawnRadius() < 0) {
+-                        playerChunkMap.playerMobSpawnMap.remove(player);
++                        regionizedWorldData.mobSpawnMap.remove(player); // Folia - region threading
+                         player.playerNaturallySpawnedEvent = null;
+                         player.lastEntitySpawnRadiusSquared = -1.0;
+                         continue;
+@@ -616,23 +567,23 @@ public class ServerChunkCache extends ChunkSource {
+                     int chunkX = io.papermc.paper.util.CoordinateUtils.getChunkCoordinate(player.getX());
+                     int chunkZ = io.papermc.paper.util.CoordinateUtils.getChunkCoordinate(player.getZ());
+ 
+-                    playerChunkMap.playerMobSpawnMap.addOrUpdate(player, chunkX, chunkZ, range);
++                    regionizedWorldData.mobSpawnMap.addOrUpdate(player, chunkX, chunkZ, range); // Folia - region threading
+                     player.lastEntitySpawnRadiusSquared = (double)((range << 4) * (range << 4)); // used in anyPlayerCloseEnoughForSpawning
+                     player.playerNaturallySpawnedEvent = event;
+                 }
+                 // Paper end - optimise chunk tick iteration
+                 int l = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
+-                boolean flag1 = this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && this.level.getLevelData().getGameTime() % this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
++                boolean flag1 = this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && this.level.getRedstoneGameTime() % this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit // Folia - region threading
+ 
+                 int chunksTicked = 0; // Paper
+                 // Paper start - optimise chunk tick iteration
+                 io.papermc.paper.util.player.NearbyPlayers nearbyPlayers = this.chunkMap.getNearbyPlayers(); // Paper - optimise chunk tick iteration
+                 Iterator<LevelChunk> chunkIterator;
+                 if (this.level.paperConfig().entities.spawning.perPlayerMobSpawns) {
+-                    chunkIterator = this.tickingChunks.iterator();
++                    chunkIterator = regionizedWorldData.getTickingChunks().iterator(); // Folia - region threading
+                 } else {
+-                    chunkIterator = this.tickingChunks.unsafeIterator();
+-                    List<LevelChunk> shuffled = Lists.newArrayListWithCapacity(this.tickingChunks.size());
++                    chunkIterator = regionizedWorldData.getTickingChunks().unsafeIterator(); // Folia - region threading
++                    List<LevelChunk> shuffled = Lists.newArrayListWithCapacity(regionizedWorldData.getTickingChunks().size()); // Folia - region threading
+                     while (chunkIterator.hasNext()) {
+                         shuffled.add(chunkIterator.next());
+                     }
+@@ -702,17 +653,21 @@ public class ServerChunkCache extends ChunkSource {
              // Paper - optimise chunk tick iteration
                  this.level.timings.broadcastChunkUpdates.startTiming(); // Paper - timing
              // Paper start - optimise chunk tick iteration
@@ -12984,7 +13054,7 @@ index 8c33a12ca879c46893150d6adfb8aa4d397c6b4c..4ed40924942bc3252fb1a533190765fb
 +                    if (!io.papermc.paper.util.TickThread.isTickThreadFor(holder.newChunkHolder.world, holder.pos)) {
 +                        continue;
 +                    }
-+                    // don't need to worry about chunk holder remove, as that can only be done by this tick thread
++                    // don't need to worry about asynchronous chunk holder remove, as that can only be done by this tick thread
 +                    holder.broadcastChanges(holder.getFullChunkNowUnchecked());
 +                    if (!holder.needsBroadcastChanges()) {
 +                        iterator.remove();
@@ -12995,7 +13065,7 @@ index 8c33a12ca879c46893150d6adfb8aa4d397c6b4c..4ed40924942bc3252fb1a533190765fb
              // Paper end - optimise chunk tick iteration
                  this.level.timings.broadcastChunkUpdates.stopTiming(); // Paper - timing
              // Paper - optimise chunk tick iteration
-@@ -747,14 +702,19 @@ public class ServerChunkCache extends ChunkSource {
+@@ -775,14 +730,19 @@ public class ServerChunkCache extends ChunkSource {
  
      @Override
      public void onLightUpdate(LightLayer type, SectionPos pos) {
@@ -13017,7 +13087,7 @@ index 8c33a12ca879c46893150d6adfb8aa4d397c6b4c..4ed40924942bc3252fb1a533190765fb
      }
  
      public <T> void addRegionTicket(TicketType<T> ticketType, ChunkPos pos, int radius, T argument) {
-@@ -826,7 +786,8 @@ public class ServerChunkCache extends ChunkSource {
+@@ -854,7 +814,8 @@ public class ServerChunkCache extends ChunkSource {
      @Nullable
      @VisibleForDebug
      public NaturalSpawner.SpawnState getLastSpawnState() {
@@ -13027,7 +13097,7 @@ index 8c33a12ca879c46893150d6adfb8aa4d397c6b4c..4ed40924942bc3252fb1a533190765fb
      }
  
      public void removeTicketsOnClosing() {
-@@ -859,8 +820,43 @@ public class ServerChunkCache extends ChunkSource {
+@@ -887,8 +848,43 @@ public class ServerChunkCache extends ChunkSource {
              return ServerChunkCache.this.mainThread;
          }
  
@@ -13071,7 +13141,7 @@ index 8c33a12ca879c46893150d6adfb8aa4d397c6b4c..4ed40924942bc3252fb1a533190765fb
              ServerChunkCache.this.level.getProfiler().incrementCounter("runTask");
              super.doRunTask(task);
          }
-@@ -868,10 +864,15 @@ public class ServerChunkCache extends ChunkSource {
+@@ -896,10 +892,15 @@ public class ServerChunkCache extends ChunkSource {
          @Override
          // CraftBukkit start - process pending Chunk loadCallback() and unloadCallback() after each run task
          public boolean pollTask() {
@@ -13089,10 +13159,10 @@ index 8c33a12ca879c46893150d6adfb8aa4d397c6b4c..4ed40924942bc3252fb1a533190765fb
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d30d5fd827 100644
+index b78a9628a88f2a495ef6de74446a02a14d41a1f6..72af30b281f2bb1dd4beee746a1b3f7bebbc7260 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -192,36 +192,35 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -194,36 +194,35 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public final ServerChunkCache chunkSource;
      private final MinecraftServer server;
      public final PrimaryLevelData serverLevelData; // CraftBukkit - type
@@ -13138,7 +13208,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
      private final alternate.current.wire.WireHandler wireHandler = new alternate.current.wire.WireHandler(this); // Paper - optimize redstone (Alternate Current)
      public static Throwable getAddToWorldStackTrace(Entity entity) {
          final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
-@@ -257,6 +256,36 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -259,6 +258,36 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          ServerChunkCache chunkProvider = this.getChunkSource();
  
@@ -13175,7 +13245,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
          for (int cx = minChunkX; cx <= maxChunkX; ++cx) {
              for (int cz = minChunkZ; cz <= maxChunkZ; ++cz) {
                  if (chunkProvider.getChunkAtIfLoadedImmediately(cx, cz) == null) {
-@@ -565,14 +594,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -567,14 +596,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
      // Paper end
      // Paper start - lag compensation
@@ -13193,7 +13263,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
      }
      // Paper end - lag compensation
      // Paper start - optimise nearby player retrieval
-@@ -619,7 +648,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -621,7 +650,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              ServerPlayer nearest = null;
              double nearestDist = Double.MAX_VALUE;
  
@@ -13202,7 +13272,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
                  double dist = player.distanceToSqr(x, y, z);
                  if (dist >= nearestDist) {
                      continue;
-@@ -675,7 +704,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -677,7 +706,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
              return nearest;
          } else {
@@ -13211,7 +13281,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
          }
      }
  
-@@ -684,6 +713,58 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -686,6 +715,58 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return this.getNearestPlayer(targetPredicate, null, x, y, z);
      }
      // Paper end - optimise nearby player retrieval
@@ -13270,7 +13340,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
  
      // Add env and gen to constructor, IWorldDataServer -> WorldDataServer
      public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
-@@ -696,13 +777,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -698,13 +779,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          this.convertable = convertable_conversionsession;
          this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
          // CraftBukkit end
@@ -13290,7 +13360,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
          this.dragonParts = new Int2ObjectOpenHashMap();
          this.tickTime = flag1;
          this.server = minecraftserver;
-@@ -741,7 +822,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -743,7 +824,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          });
          this.chunkSource.getGeneratorState().ensureStructuresGenerated();
          this.portalForcer = new PortalForcer(this);
@@ -13299,7 +13369,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
          this.prepareWeather();
          this.getWorldBorder().setAbsoluteMaxSize(minecraftserver.getAbsoluteMaxWorldSize());
          this.raids = (Raids) this.getDataStorage().computeIfAbsent(Raids.factory(this), Raids.getFileId(this.dimensionTypeRegistration()));
-@@ -768,7 +849,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -770,7 +851,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          this.chunkTaskScheduler = new io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler(this, io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.workerThreads); // Paper - rewrite chunk system
          this.entityLookup = new io.papermc.paper.chunk.system.entity.EntityLookup(this, new EntityCallbacks()); // Paper - rewrite chunk system
@@ -13314,7 +13384,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
  
      // Paper start
      @Override
-@@ -801,47 +889,30 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -803,44 +891,27 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return this.structureManager;
      }
  
@@ -13325,14 +13395,20 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
  
 -        this.handlingTick = true;
 +        regionizedWorldData.setHandlingTick(true); // Folia - regionised ticking
-         gameprofilerfiller.push("world border");
--        this.getWorldBorder().tick();
-+        if (region == null) this.getWorldBorder().tick(); // Folia - regionised ticking - moved into global tick
-         gameprofilerfiller.popPush("weather");
--        this.advanceWeatherCycle();
+         TickRateManager tickratemanager = this.tickRateManager();
+         boolean flag = tickratemanager.runsNormally();
+ 
+         if (flag) {
+             gameprofilerfiller.push("world border");
+-            this.getWorldBorder().tick();
++            if (region == null) this.getWorldBorder().tick(); // Folia - regionised ticking
+             gameprofilerfiller.popPush("weather");
+-            this.advanceWeatherCycle();
++            if (region == null) this.advanceWeatherCycle(); // Folia - regionised ticking
+         }
+ 
 -        int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
-+        if (region == null) this.advanceWeatherCycle();
-+        //int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE); // Folia - region threading - move intotickSleep
++        //int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE); // Folia - region threading - move into tickSleep
          long j;
  
 -        if (this.sleepStatus.areEnoughSleeping(i) && this.sleepStatus.areEnoughDeepSleeping(i, this.players)) {
@@ -13358,10 +13434,13 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
  
 -        this.updateSkyBrightness();
 +        if (region == null) this.updateSkyBrightness(); // Folia - region threading
-         this.tickTime();
+         if (flag) {
+             this.tickTime();
+         }
+@@ -848,11 +919,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
          gameprofilerfiller.popPush("tickPending");
          this.timings.scheduledBlocks.startTiming(); // Paper
-         if (!this.isDebug()) {
+         if (!this.isDebug() && flag) {
 -            j = this.getGameTime();
 +            j = regionizedWorldData.getRedstoneGameTime(); // Folia - region threading
              gameprofilerfiller.push("blockTicks");
@@ -13373,26 +13452,26 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
              gameprofilerfiller.pop();
          }
          this.timings.scheduledBlocks.stopTiming(); // Paper
-@@ -858,7 +929,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         this.timings.doSounds.startTiming(); // Spigot
-         this.runBlockEvents();
-         this.timings.doSounds.stopTiming(); // Spigot
+@@ -875,7 +946,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+             this.timings.doSounds.stopTiming(); // Spigot
+         }
+ 
 -        this.handlingTick = false;
 +        regionizedWorldData.setHandlingTick(false); // Folia - regionised ticking
          gameprofilerfiller.pop();
-         boolean flag = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
+         boolean flag1 = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
  
-@@ -870,20 +941,30 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -887,20 +958,30 @@ public class ServerLevel extends Level implements WorldGenLevel {
              gameprofilerfiller.push("entities");
              this.timings.tickEntities.startTiming(); // Spigot
-             if (this.dragonFight != null) {
+             if (this.dragonFight != null && flag) {
 +                if (io.papermc.paper.util.TickThread.isTickThreadFor(this, this.dragonFight.origin)) { // Folia - region threading
                  gameprofilerfiller.push("dragonFight");
                  this.dragonFight.tick();
                  gameprofilerfiller.pop();
-+                } else {  // Folia start - region threading
++                } else { // Folia start - region threading
 +                    // try to load dragon fight
-+                    ChunkPos fightCenter = new ChunkPos(0, 0);
++                    ChunkPos fightCenter = new ChunkPos(this.dragonFight.origin);
 +                    this.chunkSource.addTicketAtLevel(
 +                        TicketType.UNKNOWN, fightCenter, io.papermc.paper.chunk.system.scheduling.ChunkHolderManager.MAX_TICKET_LEVEL,
 +                        fightCenter
@@ -13407,14 +13486,14 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
                  if (!entity.isRemoved()) {
                      if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
                          entity.discard();
-                     } else {
+                     } else if (!tickratemanager.isEntityFrozen(entity)) {
                          gameprofilerfiller.push("checkDespawn");
                          entity.checkDespawn();
 +                        if (entity.isRemoved()) return; // Folia - region threading - if we despawned, DON'T TICK IT!
                          gameprofilerfiller.pop();
                          if (true || this.chunkSource.chunkMap.getDistanceManager().inEntityTickingRange(entity.chunkPosition().toLong())) { // Paper - now always true if in the ticking list
                              Entity entity1 = entity.getVehicle();
-@@ -914,6 +995,31 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -931,6 +1012,31 @@ public class ServerLevel extends Level implements WorldGenLevel {
          gameprofilerfiller.pop();
      }
  
@@ -13446,7 +13525,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
      @Override
      public boolean shouldTickBlocksAt(long chunkPos) {
          // Paper start - replace player chunk loader system
-@@ -924,11 +1030,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -941,11 +1047,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      protected void tickTime() {
          if (this.tickTime) {
@@ -13463,7 +13542,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
                  this.setDayTime(this.levelData.getDayTime() + 1L);
              }
  
-@@ -957,15 +1064,23 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -974,15 +1081,23 @@ public class ServerLevel extends Level implements WorldGenLevel {
      private void wakeUpAllPlayers() {
          this.sleepStatus.removeAllSleepers();
          (this.players.stream().filter(LivingEntity::isSleeping).collect(Collectors.toList())).forEach((entityplayer) -> { // CraftBukkit - decompile error
@@ -13490,7 +13569,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
          ChunkPos chunkcoordintpair = chunk.getPos();
          boolean flag = this.isRaining();
          int j = chunkcoordintpair.getMinBlockX();
-@@ -973,7 +1088,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -990,7 +1105,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("thunder");
@@ -13499,7 +13578,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
  
          if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - disable thunder
              blockposition.set(this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15))); // Paper
-@@ -1027,7 +1142,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1046,7 +1161,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  int yPos = (sectionIndex + minSection) << 4;
                  for (int a = 0; a < randomTickSpeed; ++a) {
                      int tickingBlocks = section.tickingList.size();
@@ -13508,16 +13587,16 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
                      if (index >= tickingBlocks) {
                          continue;
                      }
-@@ -1041,7 +1156,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1060,7 +1175,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      BlockPos blockposition2 = blockposition.set(j + randomX, randomY, k + randomZ);
                      BlockState iblockdata = com.destroystokyo.paper.util.maplist.IBlockDataList.getBlockDataFromRaw(raw);
  
 -                    iblockdata.randomTick(this, blockposition2, this.randomTickRandom);
 +                    iblockdata.randomTick(this, blockposition2, randomTickRandom); // Folia - region threading
-                     // We drop the fluid tick since LAVA is ALREADY TICKED by the above method (See LiquidBlock).
-                     // TODO CHECK ON UPDATE (ping the Canadian)
                  }
-@@ -1142,7 +1257,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+                 // We drop the fluid tick since LAVA is ALREADY TICKED by the above method (See LiquidBlock).
+                 // TODO CHECK ON UPDATE (ping the Canadian)
+@@ -1165,7 +1280,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      public boolean isHandlingTick() {
@@ -13526,7 +13605,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
      }
  
      public boolean canSleepThroughNights() {
-@@ -1174,6 +1289,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1197,6 +1312,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      public void updateSleepingPlayerList() {
@@ -13541,7 +13620,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
          if (!this.players.isEmpty() && this.sleepStatus.update(this.players)) {
              this.announceSleepStatus();
          }
-@@ -1185,7 +1308,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1208,7 +1331,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return this.server.getScoreboard();
      }
  
@@ -13550,7 +13629,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
          boolean flag = this.isRaining();
  
          if (this.dimensionType().hasSkyLight()) {
-@@ -1271,23 +1394,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1294,23 +1417,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
              this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.THUNDER_LEVEL_CHANGE, this.thunderLevel));
          }
          // */
@@ -13584,7 +13663,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
              }
          }
          // CraftBukkit end
-@@ -1351,7 +1475,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1375,7 +1499,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      public void tickNonPassenger(Entity entity) {
          // Paper start - log detailed entity tick information
@@ -13593,7 +13672,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
          try {
              if (currentlyTickingEntity.get() == null) {
                  currentlyTickingEntity.lazySet(entity);
-@@ -1384,7 +1508,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1408,7 +1532,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (isActive) { // Paper - EAR 2
              TimingHistory.activatedEntityTicks++;
          entity.tick();
@@ -13611,7 +13690,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
          } else { entity.inactiveTick(); } // Paper - EAR 2
          this.getProfiler().pop();
          } finally { timer.stopTiming(); } // Paper - timings
-@@ -1407,7 +1540,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1431,7 +1564,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      private void tickPassenger(Entity vehicle, Entity passenger) {
          if (!passenger.isRemoved() && passenger.getVehicle() == vehicle) {
@@ -13620,7 +13699,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
                  // Paper - EAR 2
                  final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(passenger);
                  co.aikar.timings.Timing timer = isActive ? passenger.getType().passengerTickTimer.startTiming() : passenger.getType().passengerInactiveTickTimer.startTiming(); // Paper
-@@ -1424,7 +1557,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1448,7 +1581,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  // Paper start - EAR 2
                  if (isActive) {
                  passenger.rideTick();
@@ -13638,7 +13717,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
                  } else {
                      passenger.setDeltaMovement(Vec3.ZERO);
                      passenger.inactiveTick();
-@@ -1512,7 +1654,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1536,7 +1678,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Paper - rewrite chunk system - entity saving moved into ChunkHolder
  
          } else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
@@ -13654,7 +13733,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
          // CraftBukkit start - moved from MinecraftServer.saveChunks
          ServerLevel worldserver1 = this;
  
-@@ -1520,12 +1670,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1544,12 +1694,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          this.serverLevelData.setCustomBossEvents(this.server.getCustomBossEvents().save());
          this.convertable.saveDataTag(this.server.registryAccess(), this.serverLevelData, this.server.getPlayerList().getSingleplayerData());
          // CraftBukkit end
@@ -13668,7 +13747,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
  
          this.getChunkSource().getDataStorage().save();
      }
-@@ -1580,6 +1725,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1604,6 +1749,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return list;
      }
  
@@ -13688,7 +13767,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
      @Nullable
      public ServerPlayer getRandomPlayer() {
          List<ServerPlayer> list = this.getPlayers(LivingEntity::isAlive);
-@@ -1681,8 +1839,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1705,8 +1863,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
          } else {
              if (entity instanceof net.minecraft.world.entity.item.ItemEntity itemEntity && itemEntity.getItem().isEmpty()) return false; // Paper - Prevent empty items from being added
              // Paper start - capture all item additions to the world
@@ -13699,7 +13778,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
                  return true;
              }
              // Paper end
-@@ -1826,7 +1984,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1850,7 +2008,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void sendBlockUpdated(BlockPos pos, BlockState oldState, BlockState newState, int flags) {
@@ -13708,7 +13787,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
              String s = "recursive call to sendBlockUpdated";
  
              Util.logAndPauseIfInIde("recursive call to sendBlockUpdated", new IllegalStateException("recursive call to sendBlockUpdated"));
-@@ -1839,7 +1997,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1863,7 +2021,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          if (Shapes.joinIsNotEmpty(voxelshape, voxelshape1, BooleanOp.NOT_SAME)) {
              List<PathNavigation> list = new ObjectArrayList();
@@ -13717,7 +13796,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
  
              while (iterator.hasNext()) {
                  // CraftBukkit start - fix SPIGOT-6362
-@@ -1862,7 +2020,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1886,7 +2044,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
              try {
@@ -13726,7 +13805,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
                  iterator = list.iterator();
  
                  while (iterator.hasNext()) {
-@@ -1871,7 +2029,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1895,7 +2053,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      navigationabstract1.recomputePath();
                  }
              } finally {
@@ -13735,7 +13814,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
              }
  
          }
-@@ -1880,23 +2038,23 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1904,23 +2062,23 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void updateNeighborsAt(BlockPos pos, Block sourceBlock) {
@@ -13764,7 +13843,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
      }
  
      @Override
-@@ -1927,7 +2085,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1951,7 +2109,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              explosion.clearToBlow();
          }
  
@@ -13773,7 +13852,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
  
          while (iterator.hasNext()) {
              ServerPlayer entityplayer = (ServerPlayer) iterator.next();
-@@ -1942,25 +2100,28 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1966,25 +2124,28 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void blockEvent(BlockPos pos, Block block, int type, int data) {
@@ -13808,7 +13887,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
      }
  
      private boolean doBlockEvent(BlockEventData event) {
-@@ -1971,12 +2132,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1995,12 +2156,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public LevelTicks<Block> getBlockTicks() {
@@ -13823,7 +13902,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
      }
  
      @Nonnull
-@@ -2000,7 +2161,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2024,7 +2185,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      public <T extends ParticleOptions> int sendParticles(ServerPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
          // Paper start - Particle API Expansion
@@ -13832,7 +13911,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
      }
      public <T extends ParticleOptions> int sendParticles(List<ServerPlayer> receivers, @Nullable ServerPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
          // Paper end
-@@ -2053,7 +2214,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2077,7 +2238,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public Entity getEntityOrPart(int id) {
          Entity entity = (Entity) this.getEntities().get(id);
  
@@ -13848,7 +13927,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
      }
  
      @Nullable
-@@ -2220,6 +2388,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2255,6 +2423,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      public boolean setChunkForced(int x, int z, boolean forced) {
@@ -13856,7 +13935,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
          ForcedChunksSavedData forcedchunk = (ForcedChunksSavedData) this.getDataStorage().computeIfAbsent(ForcedChunksSavedData.factory(), "chunks");
          ChunkPos chunkcoordintpair = new ChunkPos(x, z);
          long k = chunkcoordintpair.toLong();
-@@ -2228,7 +2397,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2263,7 +2432,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (forced) {
              flag1 = forcedchunk.getChunks().add(k);
              if (flag1) {
@@ -13865,7 +13944,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
              }
          } else {
              flag1 = forcedchunk.getChunks().remove(k);
-@@ -2256,13 +2425,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2291,13 +2460,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
              BlockPos blockposition1 = pos.immutable();
  
              optional.ifPresent((holder) -> {
@@ -13887,7 +13966,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
                      // Paper start
                      if (optional.isEmpty() && this.getPoiManager().exists(blockposition1, poiType -> true)) {
                          this.getPoiManager().remove(blockposition1);
-@@ -2270,7 +2444,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2305,7 +2479,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      // Paper end
                      this.getPoiManager().add(blockposition1, holder);
                      DebugPackets.sendPoiAddedPacket(this, blockposition1);
@@ -13901,7 +13980,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
              });
          }
      }
-@@ -2317,7 +2496,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2352,7 +2531,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          BufferedWriter bufferedwriter = Files.newBufferedWriter(path.resolve("stats.txt"));
  
          try {
@@ -13910,7 +13989,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
              NaturalSpawner.SpawnState spawnercreature_d = this.getChunkSource().getLastSpawnState();
  
              if (spawnercreature_d != null) {
-@@ -2331,7 +2510,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2366,7 +2545,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
              bufferedwriter.write(String.format(Locale.ROOT, "entities: %s\n", this.entityLookup.getDebugInfo())); // Paper - rewrite chunk system
@@ -13919,7 +13998,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
              bufferedwriter.write(String.format(Locale.ROOT, "block_ticks: %d\n", this.getBlockTicks().count()));
              bufferedwriter.write(String.format(Locale.ROOT, "fluid_ticks: %d\n", this.getFluidTicks().count()));
              bufferedwriter.write("distance_manager: " + playerchunkmap.getDistanceManager().getDebugStatus() + "\n");
-@@ -2477,7 +2656,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2512,7 +2691,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      private void dumpBlockEntityTickers(Writer writer) throws IOException {
          CsvOutput csvwriter = CsvOutput.builder().addColumn("x").addColumn("y").addColumn("z").addColumn("type").build(writer);
@@ -13928,7 +14007,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
  
          while (iterator.hasNext()) {
              TickingBlockEntity tickingblockentity = (TickingBlockEntity) iterator.next();
-@@ -2490,7 +2669,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2525,7 +2704,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @VisibleForTesting
      public void clearBlockEvents(BoundingBox box) {
@@ -13937,7 +14016,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
              return box.isInside(blockactiondata.pos());
          });
      }
-@@ -2499,7 +2678,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2534,7 +2713,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public void blockUpdated(BlockPos pos, Block block) {
          if (!this.isDebug()) {
              // CraftBukkit start
@@ -13946,7 +14025,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
                  return;
              }
              // CraftBukkit end
-@@ -2542,9 +2721,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2577,9 +2756,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @VisibleForTesting
      public String getWatchdogStats() {
@@ -13957,7 +14036,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
      }
  
      private static <T> String getTypeCount(Iterable<T> items, Function<T, String> classifier) {
-@@ -2577,6 +2754,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2612,6 +2789,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public static void makeObsidianPlatform(ServerLevel worldserver, Entity entity) {
          // CraftBukkit end
          BlockPos blockposition = ServerLevel.END_SPAWN_POINT;
@@ -13970,7 +14049,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
          int i = blockposition.getX();
          int j = blockposition.getY() - 2;
          int k = blockposition.getZ();
-@@ -2589,11 +2772,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2624,11 +2807,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          BlockPos.betweenClosed(i - 2, j, k - 2, i + 2, j, k + 2).forEach((blockposition1) -> {
              blockList.setBlock(blockposition1, Blocks.OBSIDIAN.defaultBlockState(), 3);
          });
@@ -13983,7 +14062,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
              blockList.updateList();
          }
          // CraftBukkit end
-@@ -2614,13 +2793,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2649,13 +2828,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      public void startTickingChunk(LevelChunk chunk) {
@@ -14002,7 +14081,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
      }
  
      @Override
-@@ -2642,7 +2822,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2677,7 +2857,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Paper end - rewrite chunk system
      }
  
@@ -14011,7 +14090,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
          // Paper start - optimize is ticking ready type functions
          io.papermc.paper.chunk.system.scheduling.NewChunkHolder chunkHolder = this.chunkTaskScheduler.chunkHolderManager.getChunkHolder(chunkPos);
          // isTicking implies the chunk is loaded, and the chunk is loaded now implies the entities are loaded
-@@ -2698,16 +2878,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2743,16 +2923,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
          public void onCreated(Entity entity) {}
  
          public void onDestroyed(Entity entity) {
@@ -14031,7 +14110,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
              // Paper start - Reset pearls when they stop being ticked
              if (paperConfig().fixes.disableUnloadedChunkEnderpearlExploit && entity instanceof net.minecraft.world.entity.projectile.ThrownEnderpearl pearl) {
                  pearl.cachedOwner = null;
-@@ -2718,6 +2898,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2763,6 +2943,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          public void onTrackingStart(Entity entity) {
              org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot
@@ -14039,7 +14118,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
              // ServerLevel.this.getChunkSource().addEntity(entity); // Paper - moved down below valid=true
              if (entity instanceof ServerPlayer) {
                  ServerPlayer entityplayer = (ServerPlayer) entity;
-@@ -2735,7 +2916,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2780,7 +2961,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration"));
                  }
  
@@ -14048,7 +14127,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
              }
  
              if (entity instanceof EnderDragon) {
-@@ -2746,7 +2927,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2791,7 +2972,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  for (int j = 0; j < i; ++j) {
                      EnderDragonPart entitycomplexpart = aentitycomplexpart[j];
  
@@ -14058,7 +14137,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
                  }
              }
  
-@@ -2767,16 +2950,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2813,16 +2996,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          public void onTrackingEnd(Entity entity) {
              org.spigotmc.AsyncCatcher.catchOp("entity unregister"); // Spigot
@@ -14084,7 +14163,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
                              map.carriedByPlayers.remove( (Player) entity );
                              for ( Iterator<MapItemSavedData.HoldingPlayer> iter = (Iterator<MapItemSavedData.HoldingPlayer>) map.carriedBy.iterator(); iter.hasNext(); )
                              {
-@@ -2786,6 +2977,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2832,6 +3023,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                                      iter.remove();
                                  }
                              }
@@ -14092,7 +14171,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
                          }
                      }
                  } );
-@@ -2820,7 +3012,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2866,7 +3058,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration"));
                  }
  
@@ -14101,7 +14180,7 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
              }
  
              if (entity instanceof EnderDragon) {
-@@ -2831,13 +3023,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2877,13 +3069,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  for (int j = 0; j < i; ++j) {
                      EnderDragonPart entitycomplexpart = aentitycomplexpart[j];
  
@@ -14119,10 +14198,10 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..10cf0ffb2cf519f0904dbe709b9042d3
                  for (ServerPlayer player : ServerLevel.this.players) {
                      player.getBukkitEntity().onEntityRemove(entity);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f71a4a8307fb092d33545e12d253e0b80c884168..89f7825a8cf415f3c2e0ddcb41c159a84d2e4bd1 100644
+index 8efbbd379244e3ed54d4aba199037cc20ccd096a..c66815bd2a13554aec7176258f8fae542d668d3f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -185,7 +185,7 @@ import org.bukkit.inventory.MainHand;
+@@ -191,7 +191,7 @@ import org.bukkit.inventory.MainHand;
  public class ServerPlayer extends Player {
  
      private static final Logger LOGGER = LogUtils.getLogger();
@@ -14130,8 +14209,8 @@ index f71a4a8307fb092d33545e12d253e0b80c884168..89f7825a8cf415f3c2e0ddcb41c159a8
 +    public long lastSave = Long.MIN_VALUE; // Paper // Folia - threaded regions - changed to nanoTime
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_XZ = 32;
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
-     public ServerGamePacketListenerImpl connection;
-@@ -463,51 +463,151 @@ public class ServerPlayer extends Player {
+     private static final int FLY_STAT_RECORDING_SPEED = 25;
+@@ -470,51 +470,151 @@ public class ServerPlayer extends Player {
      }
      // CraftBukkit end
  
@@ -14214,7 +14293,7 @@ index f71a4a8307fb092d33545e12d253e0b80c884168..89f7825a8cf415f3c2e0ddcb41c159a8
 +        ++attemptCount[0];
  
 -                if (blockposition1 != null) {
--                    this.moveTo(blockposition1, 0.0F, 0.0F);
+-                    this.moveTo(blockposition1, world.getSharedSpawnAngle(), 0.0F); // Paper - MC-200092 - fix first spawn pos yaw being ignored
 -                    if (world.noCollision(this, this.getBoundingBox(), true)) { // Paper - make sure this loads chunks, we default to NOT loading now
 -                        break;
 +        BlockPos rough = getRandomSpawn(world, random);
@@ -14241,7 +14320,7 @@ index f71a4a8307fb092d33545e12d253e0b80c884168..89f7825a8cf415f3c2e0ddcb41c159a8
                  }
 -            }
 -        } else {
--            this.moveTo(blockposition, 0.0F, 0.0F);
+-            this.moveTo(blockposition, world.getSharedSpawnAngle(), 0.0F); // Paper - MC-200092 - fix first spawn pos yaw being ignored
 +            );
 +            return true;
 +        }
@@ -14313,7 +14392,7 @@ index f71a4a8307fb092d33545e12d253e0b80c884168..89f7825a8cf415f3c2e0ddcb41c159a8
          return horizontalSpawnArea <= 16 ? horizontalSpawnArea - 1 : 17;
      }
  
-@@ -1166,6 +1266,337 @@ public class ServerPlayer extends Player {
+@@ -1168,6 +1268,337 @@ public class ServerPlayer extends Player {
          }
      }
  
@@ -14651,7 +14730,7 @@ index f71a4a8307fb092d33545e12d253e0b80c884168..89f7825a8cf415f3c2e0ddcb41c159a8
      @Nullable
      @Override
      public Entity changeDimension(ServerLevel destination) {
-@@ -1175,6 +1606,11 @@ public class ServerPlayer extends Player {
+@@ -1177,6 +1608,11 @@ public class ServerPlayer extends Player {
  
      @Nullable
      public Entity changeDimension(ServerLevel worldserver, PlayerTeleportEvent.TeleportCause cause) {
@@ -14663,7 +14742,7 @@ index f71a4a8307fb092d33545e12d253e0b80c884168..89f7825a8cf415f3c2e0ddcb41c159a8
          // CraftBukkit end
          if (this.isSleeping()) return this; // CraftBukkit - SPIGOT-3154
          // this.isChangingDimension = true; // CraftBukkit - Moved down and into PlayerList#changeDimension
-@@ -2132,6 +2568,12 @@ public class ServerPlayer extends Player {
+@@ -2231,6 +2667,12 @@ public class ServerPlayer extends Player {
      public void setCamera(@Nullable Entity entity) {
          Entity entity1 = this.getCamera();
  
@@ -14676,7 +14755,7 @@ index f71a4a8307fb092d33545e12d253e0b80c884168..89f7825a8cf415f3c2e0ddcb41c159a8
          this.camera = (Entity) (entity == null ? this : entity);
          if (entity1 != this.camera) {
              // Paper start - Add PlayerStartSpectatingEntityEvent and PlayerStopSpectatingEntity Event
-@@ -2633,7 +3075,7 @@ public class ServerPlayer extends Player {
+@@ -2732,7 +3174,7 @@ public class ServerPlayer extends Player {
          this.experienceLevel = this.newLevel;
          this.totalExperience = this.newTotalExp;
          this.experienceProgress = 0;
@@ -14686,7 +14765,7 @@ index f71a4a8307fb092d33545e12d253e0b80c884168..89f7825a8cf415f3c2e0ddcb41c159a8
          this.removeAllEffects(org.bukkit.event.entity.EntityPotionEffectEvent.Cause.DEATH);
          this.effectsDirty = true;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 106a312aba249d1e83e4b535fc6e741e04ccfd14..0806559b4f4cebc88fb1f724a6916dac0c0c95e4 100644
+index 58f972832c39a27a8ccd606f9144e1c54adbf6f3..150bc66a9319cf33ce0782e22173e88cd77073e9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -128,7 +128,7 @@ public class ServerPlayerGameMode {
@@ -14707,16 +14786,16 @@ index 106a312aba249d1e83e4b535fc6e741e04ccfd14..0806559b4f4cebc88fb1f724a6916dac
              if (iblockdata == null) {
                  this.isDestroyingBlock = false;
                  return;
-@@ -417,7 +417,7 @@ public class ServerPlayerGameMode {
+@@ -416,7 +416,7 @@ public class ServerPlayerGameMode {
              } else {
                  // CraftBukkit start
                  org.bukkit.block.BlockState state = bblock.getState();
 -                this.level.captureDrops = new ArrayList<>();
 +                this.level.getCurrentWorldData().captureDrops = new ArrayList<>(); // Folia - region threading
                  // CraftBukkit end
-                 block.playerWillDestroy(this.level, pos, iblockdata, this.player);
+                 BlockState iblockdata1 = block.playerWillDestroy(this.level, pos, iblockdata, this.player);
                  boolean flag = this.level.removeBlock(pos, false);
-@@ -445,8 +445,8 @@ public class ServerPlayerGameMode {
+@@ -444,8 +444,8 @@ public class ServerPlayerGameMode {
                      // return true; // CraftBukkit
                  }
                  // CraftBukkit start
@@ -14838,7 +14917,7 @@ index 658e63ebde81dc14c8ab5850fb246dc0aab25dea..7e1f15ac8d2f7c86d4aba1be5df71705
      public static <T> TicketType<T> create(String name, Comparator<T> argumentComparator) {
          return new TicketType<>(name, argumentComparator, 0L);
 diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index 50ed7cfe1ecef6d075ba484804827cec83ba2bf2..41c03421edd88dba669354595a2ace1277d93af6 100644
+index 14a5492428eac823a295ef3746d0aca6fbdab4ec..f06392b0515da3640720e115709fe98f86821024 100644
 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 @@ -84,6 +84,13 @@ public class WorldGenRegion implements WorldGenLevel {
@@ -14856,7 +14935,7 @@ index 50ed7cfe1ecef6d075ba484804827cec83ba2bf2..41c03421edd88dba669354595a2ace12
          this.generatingStatus = status;
          this.writeRadiusCutoff = placementRadius;
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 598f807f0d0caac98b81e0e2991f1bd497c4534e..2bb944cef9bc8c5e56023ef20921ef13509d4823 100644
+index 4a712f5fc4f0b4a4434ae808c989113bee8d8634..ce200192b4dddfc9b2d3c355838596b7deef1c69 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -85,6 +85,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -14916,7 +14995,7 @@ index 598f807f0d0caac98b81e0e2991f1bd497c4534e..2bb944cef9bc8c5e56023ef20921ef13
  
      protected boolean isSingleplayerOwner() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-index 8dbcc1b3a70b6bbea3bd2d15b6d66cc4f9cd53f8..d57130a8e1d28ce2458d11197911d12b9ca801ea 100644
+index cae10b963d153fb1777b18054796a45b2809342b..080a25714937e8413c4e9d15eb257f726a03ea7f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
 @@ -43,6 +43,7 @@ public class ServerConfigurationPacketListenerImpl extends ServerCommonPacketLis
@@ -15015,19 +15094,19 @@ index 79326308f6126f84a3cbb3d5a33302de048d8a50..81090d1b5d67506268a41c6387a1d453
                  Collections.shuffle( this.connections );
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775679c4ce9 100644
+index 30ccbab1586a656e0ae41d7406525fb02d9e025b..645ab5d149a207bed00357fe0aaf070d4b27d15a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -289,7 +289,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     private final LastSeenMessagesValidator lastSeenMessages;
-     private final MessageSignatureCache messageSignatureCache;
+@@ -292,7 +292,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+     private final LastSeenMessagesValidator lastSeenMessages = new LastSeenMessagesValidator(20);
+     private final MessageSignatureCache messageSignatureCache = MessageSignatureCache.createDefault();
      private final FutureChain chatMessageChain;
 -    private boolean waitingForSwitchToConfig;
 +    public volatile boolean waitingForSwitchToConfig; // Folia - rewrite login process - fix bad ordering of this field write + public
      private static final int MAX_SIGN_LINE_LENGTH = Integer.getInteger("Paper.maxSignLength", 80); // Paper
  
      public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player, CommonListenerCookie clientData) {
-@@ -307,10 +307,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -310,10 +310,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      }
  
      // CraftBukkit start - add fields
@@ -15041,7 +15120,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
      private int dropCount = 0;
  
      // Get position of last block hit for BlockDamageLevel.STOPPED
-@@ -323,8 +323,21 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -326,8 +326,21 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      private boolean hasMoved; // Spigot
      // CraftBukkit end
  
@@ -15063,7 +15142,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
          if (this.ackBlockChangesUpTo > -1) {
              this.send(new ClientboundBlockChangedAckPacket(this.ackBlockChangesUpTo));
              this.ackBlockChangesUpTo = -1;
-@@ -373,7 +386,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -376,7 +389,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              this.aboveGroundVehicleTickCount = 0;
          }
  
@@ -15072,7 +15151,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
          // CraftBukkit start
          for (int spam; (spam = this.chatSpamTickCount.get()) > 0 && !this.chatSpamTickCount.compareAndSet(spam, spam - 1); ) ;
          if (tabSpamLimiter.get() > 0) tabSpamLimiter.getAndDecrement(); // Paper - split to seperate variable
-@@ -410,6 +423,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -413,6 +426,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          this.lastGoodX = this.player.getX();
          this.lastGoodY = this.player.getY();
          this.lastGoodZ = this.player.getZ();
@@ -15092,7 +15171,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
      }
  
      @Override
-@@ -506,9 +532,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -509,9 +535,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  // Paper end - fix large move vectors killing the server
  
                  // CraftBukkit start - handle custom speeds and skipped ticks
@@ -15105,7 +15184,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
  
                  ++this.receivedMovePacketCount;
                  int i = this.receivedMovePacketCount - this.knownMovePacketCount;
-@@ -583,7 +610,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -586,7 +613,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  Location curPos = this.getCraftPlayer().getLocation(); // Spigot
  
                  entity.absMoveTo(d3, d4, d5, f, f1);
@@ -15114,7 +15193,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
  
                  // Paper start - optimise out extra getCubes
                  boolean teleportBack = flag2; // violating this is always a fail
-@@ -596,11 +623,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -599,11 +626,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  }
                  if (teleportBack) { // Paper end - optimise out extra getCubes
                      entity.absMoveTo(d0, d1, d2, f, f1);
@@ -15135,7 +15214,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                  // CraftBukkit start - fire PlayerMoveEvent
                  Player player = this.getCraftPlayer();
                  // Spigot Start
-@@ -646,7 +681,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -649,7 +684,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                          // If the event is cancelled we move the player back to their old location.
                          if (event.isCancelled()) {
@@ -15144,7 +15223,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                              return;
                          }
  
-@@ -654,7 +689,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -657,7 +692,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                          // there to avoid any 'Moved wrongly' or 'Moved too quickly' errors.
                          // We only do this if the Event was not cancelled.
                          if (!oldTo.equals(event.getTo()) && !event.isCancelled()) {
@@ -15153,7 +15232,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                              return;
                          }
  
-@@ -771,13 +806,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -774,13 +809,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // Paper - run this async
          // CraftBukkit start
          if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable
@@ -15169,7 +15248,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
              return;
          }
          // Paper end
-@@ -802,7 +837,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -805,7 +840,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              if (!event.isHandled()) {
                  if (!event.isCancelled()) {
  
@@ -15178,7 +15257,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                          ParseResults<CommandSourceStack> parseresults = this.server.getCommands().getDispatcher().parse(stringreader, this.player.createCommandSourceStack());
  
                          this.server.getCommands().getDispatcher().getCompletionSuggestions(parseresults).thenAccept((suggestions) -> {
-@@ -818,7 +853,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -821,7 +856,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                              this.connection.send(new ClientboundCommandSuggestionsPacket(packet.getId(), suggestEvent.getSuggestions()));
                              // Paper end - Brigadier API
                          });
@@ -15187,7 +15266,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                  }
              } else if (!completions.isEmpty()) {
                  final com.mojang.brigadier.suggestion.SuggestionsBuilder builder0 = new com.mojang.brigadier.suggestion.SuggestionsBuilder(command, stringreader.getTotalLength());
-@@ -1130,7 +1165,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1135,7 +1170,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  int byteLength = testString.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
                  if (byteLength > 256 * 4) {
                      ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send a book with with a page too large!");
@@ -15196,7 +15275,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                      return;
                  }
                  byteTotal += byteLength;
-@@ -1153,17 +1188,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1158,17 +1193,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
              if (byteTotal > byteAllowed) {
                  ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed:  "+ byteAllowed + " - Pages: " + pageList.size());
@@ -15218,7 +15297,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
          // CraftBukkit end
          int i = packet.getSlot();
  
-@@ -1183,7 +1218,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1188,7 +1223,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  this.updateBookContents(list1, i);
              };
  
@@ -15239,20 +15318,20 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
          }
      }
  
-@@ -1349,9 +1396,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                             int i = this.receivedMovePacketCount - this.knownMovePacketCount;
+@@ -1375,9 +1422,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+                                 int i = this.receivedMovePacketCount - this.knownMovePacketCount;
  
-                             // CraftBukkit start - handle custom speeds and skipped ticks
--                            this.allowedPlayerTicks += (System.currentTimeMillis() / 50) - this.lastTick;
-+                            int currTick = (int)(Util.getMillis() / 50); // Folia - region threading
-+                            this.allowedPlayerTicks += currTick - this.lastTick; // Folia - region threading
-                             this.allowedPlayerTicks = Math.max(this.allowedPlayerTicks, 1);
--                            this.lastTick = (int) (System.currentTimeMillis() / 50);
-+                            this.lastTick = (int) currTick; // Folia - region threading
+                                 // CraftBukkit start - handle custom speeds and skipped ticks
+-                                this.allowedPlayerTicks += (System.currentTimeMillis() / 50) - this.lastTick;
++                                int currTick = (int)(Util.getMillis() / 50); // Folia - region threading
++                                this.allowedPlayerTicks += currTick - this.lastTick; // Folia - region threading
+                                 this.allowedPlayerTicks = Math.max(this.allowedPlayerTicks, 1);
+-                                this.lastTick = (int) (System.currentTimeMillis() / 50);
++                                this.lastTick = (int) currTick; // Folia - region threading
  
-                             if (i > Math.max(this.allowedPlayerTicks, 5)) {
-                                 ServerGamePacketListenerImpl.LOGGER.debug("{} is sending move packets too frequently ({} packets since last tick)", this.player.getName().getString(), i);
-@@ -1537,7 +1585,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+                                 if (i > Math.max(this.allowedPlayerTicks, 5)) {
+                                     ServerGamePacketListenerImpl.LOGGER.debug("{} is sending move packets too frequently ({} packets since last tick)", this.player.getName().getString(), i);
+@@ -1564,7 +1612,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                                          // If the event is cancelled we move the player back to their old location.
                                          if (event.isCancelled()) {
@@ -15261,7 +15340,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                                              return;
                                          }
  
-@@ -1545,7 +1593,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1572,7 +1620,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                          // there to avoid any 'Moved wrongly' or 'Moved too quickly' errors.
                                          // We only do this if the Event was not cancelled.
                                          if (!oldTo.equals(event.getTo()) && !event.isCancelled()) {
@@ -15270,7 +15349,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                                              return;
                                          }
  
-@@ -1778,9 +1826,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1805,9 +1853,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  if (!this.player.isSpectator()) {
                      // limit how quickly items can be dropped
                      // If the ticks aren't the same then the count starts from 0 and we update the lastDropTick.
@@ -15282,7 +15361,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                      } else {
                          // Else we increment the drop count and check the amount.
                          this.dropCount++;
-@@ -1808,7 +1856,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1835,7 +1883,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              case ABORT_DESTROY_BLOCK:
              case STOP_DESTROY_BLOCK:
                  // Paper start - Don't allow digging in unloaded chunks
@@ -15291,7 +15370,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                      this.player.connection.ackBlockChangesUpTo(packet.getSequence());
                      return;
                  }
-@@ -1892,7 +1940,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1919,7 +1967,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              BlockPos blockposition = movingobjectpositionblock.getBlockPos();
              Vec3 vec3d1 = Vec3.atCenterOf(blockposition);
  
@@ -15300,7 +15379,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                  Vec3 vec3d2 = vec3d.subtract(vec3d1);
                  double d0 = 1.0000001D;
  
-@@ -2006,7 +2054,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2033,7 +2081,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  Entity entity = packet.getEntity(worldserver);
  
                  if (entity != null) {
@@ -15309,7 +15388,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                      return;
                  }
              }
-@@ -2043,7 +2091,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2070,7 +2118,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
          // CraftBukkit end
          ServerGamePacketListenerImpl.LOGGER.info("{} lost connection: {}", this.player.getName().getString(), reason.getString());
@@ -15318,7 +15397,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
          super.onDisconnect(reason, quitMessage); // Paper
      }
  
-@@ -2052,6 +2100,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2079,6 +2127,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          this.removePlayerFromWorld(null);
      }
  
@@ -15327,7 +15406,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
      private void removePlayerFromWorld(@Nullable net.kyori.adventure.text.Component quitMessage) {
          // Paper end
          this.chatMessageChain.close();
-@@ -2064,6 +2114,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2091,6 +2141,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          this.player.disconnect();
          // Paper start - Adventure
          quitMessage = quitMessage == null ? this.server.getPlayerList().remove(this.player) : this.server.getPlayerList().remove(this.player, quitMessage); // Paper - pass in quitMessage to fix kick message not being used
@@ -15336,29 +15415,25 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
          if ((quitMessage != null) && !quitMessage.equals(net.kyori.adventure.text.Component.empty())) {
              this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(quitMessage), false);
              // Paper end
-@@ -2116,9 +2168,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2143,7 +2195,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
          // CraftBukkit end
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.message())) {
--            this.server.scheduleOnMain(() -> { // Paper - push to main for event firing
 +            // Folia - region threading
              this.disconnect(Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper - add cause
--            }); // Paper - push to main for event firing
 +            // Folia - region threading
          } else {
-             Optional<LastSeenMessages> optional = this.tryHandleChat(packet.message(), packet.timeStamp(), packet.lastSeenMessages());
+             Optional<LastSeenMessages> optional = this.tryHandleChat(packet.lastSeenMessages());
  
-@@ -2151,23 +2203,22 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2175,21 +2229,22 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      @Override
      public void handleChatCommand(ServerboundChatCommandPacket packet) {
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.command())) {
--            this.server.scheduleOnMain(() -> { // Paper - push to main for event firing
 +            // Folia - region threading
              this.disconnect(Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper
--            }); // Paper - push to main for event firing
 +            // Folia - region threading
          } else {
-             Optional<LastSeenMessages> optional = this.tryHandleChat(packet.command(), packet.timeStamp(), packet.lastSeenMessages());
+             Optional<LastSeenMessages> optional = this.tryHandleChat(packet.lastSeenMessages());
  
              if (optional.isPresent()) {
 -                this.server.submit(() -> {
@@ -15376,19 +15451,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
              }
  
          }
-@@ -2241,9 +2292,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
-         if (!this.updateChatOrder(timestamp)) {
-             ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}': {} > {}", this.player.getName().getString(), message, this.lastChatTimeStamp.get().getEpochSecond(), timestamp.getEpochSecond()); // Paper
--            this.server.scheduleOnMain(() -> { // Paper - push to main
-+            // Folia - region threading
-             this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes
--            }); // Paper - push to main
-+            // Folia - region threading
-             return Optional.empty();
-         } else {
-             Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(acknowledgment);
-@@ -2318,7 +2369,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2320,7 +2375,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              String originalFormat = event.getFormat(), originalMessage = event.getMessage();
              this.cserver.getPluginManager().callEvent(event);
  
@@ -15397,7 +15460,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                  // Evil plugins still listening to deprecated event
                  final PlayerChatEvent queueEvent = new PlayerChatEvent(player, event.getMessage(), event.getFormat(), event.getRecipients());
                  queueEvent.setCancelled(event.isCancelled());
-@@ -2429,6 +2480,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2431,6 +2486,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          if (s.isEmpty()) {
              ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send an empty message");
          } else if (this.getCraftPlayer().isConversing()) {
@@ -15405,7 +15468,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
              final String conversationInput = s;
              this.server.processQueue.add(new Runnable() {
                  @Override
-@@ -2665,8 +2717,25 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2667,8 +2723,25 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      // Spigot End
  
      public void switchToConfig() {
@@ -15432,7 +15495,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
          this.send(new ClientboundStartConfigurationPacket());
      }
  
-@@ -2691,7 +2760,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2693,7 +2766,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
          this.player.resetLastActionTime();
          this.player.setShiftKeyDown(packet.isUsingSecondaryAction());
@@ -15441,7 +15504,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
              if (!worldserver.getWorldBorder().isWithinBounds(entity.blockPosition())) {
                  return;
              }
-@@ -2832,6 +2901,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2834,6 +2907,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          switch (packetplayinclientcommand_enumclientcommand) {
              case PERFORM_RESPAWN:
                  if (this.player.wonGame) {
@@ -15454,7 +15517,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                      this.player.wonGame = false;
                      this.player = this.server.getPlayerList().respawn(this.player, this.server.getLevel(this.player.getRespawnDimension()), true, null, true, RespawnReason.END_PORTAL, org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag.END_PORTAL); // Paper - add isEndCreditsRespawn argument
                      CriteriaTriggers.CHANGED_DIMENSION.trigger(this.player, Level.END, Level.OVERWORLD);
-@@ -2840,6 +2915,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2842,6 +2921,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                          return;
                      }
  
@@ -15473,7 +15536,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                      this.player = this.server.getPlayerList().respawn(this.player, false, RespawnReason.DEATH);
                      if (this.server.isHardcore()) {
                          this.player.setGameMode(GameType.SPECTATOR, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.HARDCORE_DEATH, null); // Paper
-@@ -3198,7 +3285,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3200,7 +3291,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
@@ -15482,7 +15545,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
                  return;
              }
          }
-@@ -3367,7 +3454,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3369,7 +3460,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
          this.filterTextPacket(list).thenAcceptAsync((list1) -> {
              this.updateSignText(packet, list1);
@@ -15503,10 +15566,10 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..159d3a27c1686fd2b0025cab5b7e7775
  
      private void updateSignText(ServerboundSignUpdatePacket packet, List<FilteredText> signText) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 1c4f272219e68373eaae93fc5ea9af7d8f3fd6f9..6f483c6581daeaf68f85e3b730d31c5b7a6ae001 100644
+index 89b3184be952fd0803520dd0f717f3acfc3cb496..d0f7434164f6241ec81c990c7a127f504e019291 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -82,9 +82,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -83,9 +83,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
          }
          // Paper end
          if (this.state == ServerLoginPacketListenerImpl.State.VERIFYING) {
@@ -15522,7 +15585,7 @@ index 1c4f272219e68373eaae93fc5ea9af7d8f3fd6f9..6f483c6581daeaf68f85e3b730d31c5b
          }
  
          if (this.state == ServerLoginPacketListenerImpl.State.WAITING_FOR_DUPE_DISCONNECT && !this.isPlayerAlreadyInWorld((GameProfile) Objects.requireNonNull(this.authenticatedProfile))) {
-@@ -227,7 +231,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -200,7 +204,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
                  }));
              }
  
@@ -15531,7 +15594,7 @@ index 1c4f272219e68373eaae93fc5ea9af7d8f3fd6f9..6f483c6581daeaf68f85e3b730d31c5b
  
              if (flag) {
                  this.state = ServerLoginPacketListenerImpl.State.WAITING_FOR_DUPE_DISCONNECT;
-@@ -353,7 +357,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -320,7 +324,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
                          uniqueId = gameprofile.getId();
                          // Paper end
  
@@ -15593,10 +15656,10 @@ index 8b1da1fb5ca27432a39aff6dbc452b793268dab5..e83f3676d5a194fa8d3d1567edcb4b6f
              // Guess we don't have a date
          }
 diff --git a/src/main/java/net/minecraft/server/players/OldUsersConverter.java b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-index ce43cb0152ba07c6c21e08142d65813d47c3b63b..8bdb1d10648965e2011b4a22a1dfc575d3bbe4e0 100644
+index c24898f8e81e8ab9a1f90bf4439ea6c6f42f0508..ce4f2239e99e94285186b46bdcd40f1dcdc3553e 100644
 --- a/src/main/java/net/minecraft/server/players/OldUsersConverter.java
 +++ b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-@@ -512,7 +512,7 @@ public class OldUsersConverter {
+@@ -511,7 +511,7 @@ public class OldUsersConverter {
          Date date1;
  
          try {
@@ -15606,10 +15669,10 @@ index ce43cb0152ba07c6c21e08142d65813d47c3b63b..8bdb1d10648965e2011b4a22a1dfc575
              date1 = fallback;
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed3ae44432 100644
+index a35638a92479b90afa89cf201fc45b49c9e767f3..0fa69640a699e1c33cb307366b0335ac9bac4282 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -133,10 +133,10 @@ public abstract class PlayerList {
+@@ -131,10 +131,10 @@ public abstract class PlayerList {
      public static final Component DUPLICATE_LOGIN_DISCONNECT_MESSAGE = Component.translatable("multiplayer.disconnect.duplicate_login");
      private static final Logger LOGGER = LogUtils.getLogger();
      private static final int SEND_PLAYER_INFO_INTERVAL = 600;
@@ -15622,7 +15685,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
      private final UserBanList bans;
      private final IpBanList ipBans;
      private final ServerOpList ops;
-@@ -157,9 +157,56 @@ public abstract class PlayerList {
+@@ -155,9 +155,56 @@ public abstract class PlayerList {
  
      // CraftBukkit start
      private CraftServer cserver;
@@ -15680,7 +15743,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
      public PlayerList(MinecraftServer server, LayeredRegistryAccess<RegistryLayer> registryManager, PlayerDataStorage saveHandler, int maxPlayers) {
          this.cserver = server.server = new CraftServer((DedicatedServer) server, this);
          server.console = new com.destroystokyo.paper.console.TerminalConsoleCommandSender(); // Paper
-@@ -180,7 +227,7 @@ public abstract class PlayerList {
+@@ -178,7 +225,7 @@ public abstract class PlayerList {
      }
      abstract public void loadAndSaveFiles(); // Paper - moved from DedicatedPlayerList constructor
  
@@ -15689,7 +15752,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
          player.isRealPlayer = true; // Paper
          player.loginTime = System.currentTimeMillis(); // Paper
          GameProfile gameprofile = player.getGameProfile();
-@@ -259,18 +306,42 @@ public abstract class PlayerList {
+@@ -257,18 +304,42 @@ public abstract class PlayerList {
              player.spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT; // set Player SpawnReason to DEFAULT on first login
          // Paper start - reset to main world spawn if first spawn or invalid world
          }
@@ -15734,7 +15797,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
  
          Location loc = ev.getSpawnLocation();
          worldserver1 = ((CraftWorld) loc.getWorld()).getHandle();
-@@ -289,6 +360,10 @@ public abstract class PlayerList {
+@@ -287,6 +358,10 @@ public abstract class PlayerList {
  
          player.loadGameTypes(nbttagcompound);
          ServerGamePacketListenerImpl playerconnection = new ServerGamePacketListenerImpl(this.server, connection, player, clientData);
@@ -15745,7 +15808,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
          GameRules gamerules = worldserver1.getGameRules();
          boolean flag = gamerules.getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN);
          boolean flag1 = gamerules.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO);
-@@ -304,7 +379,7 @@ public abstract class PlayerList {
+@@ -302,7 +377,7 @@ public abstract class PlayerList {
          this.sendPlayerPermissionLevel(player);
          player.getStats().markAllDirty();
          player.getRecipeBook().sendInitialRecipeBook(player);
@@ -15754,7 +15817,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
          this.server.invalidateStatus();
          MutableComponent ichatmutablecomponent;
  
-@@ -346,7 +421,7 @@ public abstract class PlayerList {
+@@ -344,7 +419,7 @@ public abstract class PlayerList {
          this.cserver.getPluginManager().callEvent(playerJoinEvent);
  
          if (!player.connection.isAcceptingMessages()) {
@@ -15763,7 +15826,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
          }
  
          final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
-@@ -361,8 +436,7 @@ public abstract class PlayerList {
+@@ -359,8 +434,7 @@ public abstract class PlayerList {
          ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player)); // Paper
  
          final List<ServerPlayer> onlinePlayers = Lists.newArrayListWithExpectedSize(this.players.size() - 1); // Paper - use single player info update packet
@@ -15773,16 +15836,16 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
  
              if (entityplayer1.getBukkitEntity().canSee(bukkitPlayer)) {
                  // Paper start
-@@ -484,7 +558,7 @@ public abstract class PlayerList {
+@@ -482,7 +556,7 @@ public abstract class PlayerList {
          // Paper start - Add to collideRule team if needed
-         final Scoreboard scoreboard = this.getServer().getLevel(Level.OVERWORLD).getScoreboard();
+         final net.minecraft.world.scores.Scoreboard scoreboard = this.getServer().getLevel(Level.OVERWORLD).getScoreboard();
          final PlayerTeam collideRuleTeam = scoreboard.getPlayerTeam(this.collideRuleTeamName);
 -        if (this.collideRuleTeamName != null && collideRuleTeam != null && player.getTeam() == null) {
 +        if (false && this.collideRuleTeamName != null && collideRuleTeam != null && player.getTeam() == null) { // Folia - region threading
              scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
          }
          // Paper end
-@@ -579,7 +653,7 @@ public abstract class PlayerList {
+@@ -577,7 +651,7 @@ public abstract class PlayerList {
  
      protected void save(ServerPlayer player) {
          if (!player.getBukkitEntity().isPersistent()) return; // CraftBukkit
@@ -15791,16 +15854,16 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
          this.playerIo.save(player);
          ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit
  
-@@ -619,7 +693,7 @@ public abstract class PlayerList {
+@@ -617,7 +691,7 @@ public abstract class PlayerList {
          // CraftBukkit end
  
          // Paper start - Remove from collideRule team if needed
 -        if (this.collideRuleTeamName != null) {
 +        if (false && this.collideRuleTeamName != null) { // Folia - region threading
-             final Scoreboard scoreBoard = this.server.getLevel(Level.OVERWORLD).getScoreboard();
+             final net.minecraft.world.scores.Scoreboard scoreBoard = this.server.getLevel(Level.OVERWORLD).getScoreboard();
              final PlayerTeam team = scoreBoard.getPlayersTeam(this.collideRuleTeamName);
              if (entityplayer.getTeam() == team && team != null) {
-@@ -659,7 +733,7 @@ public abstract class PlayerList {
+@@ -657,7 +731,7 @@ public abstract class PlayerList {
  
          entityplayer.unRide();
          worldserver.removePlayerImmediately(entityplayer, Entity.RemovalReason.UNLOADED_WITH_PLAYER);
@@ -15809,7 +15872,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
          entityplayer.getAdvancements().stopListening();
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
-@@ -678,8 +752,7 @@ public abstract class PlayerList {
+@@ -676,8 +750,7 @@ public abstract class PlayerList {
          // CraftBukkit start
          // this.broadcastAll(new ClientboundPlayerInfoRemovePacket(List.of(entityplayer.getUUID())));
          ClientboundPlayerInfoRemovePacket packet = new ClientboundPlayerInfoRemovePacket(List.of(entityplayer.getUUID()));
@@ -15819,7 +15882,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
  
              if (entityplayer2.getBukkitEntity().canSee(entityplayer.getBukkitEntity())) {
                  entityplayer2.connection.send(packet);
-@@ -704,19 +777,13 @@ public abstract class PlayerList {
+@@ -702,19 +775,13 @@ public abstract class PlayerList {
  
          ServerPlayer entityplayer;
  
@@ -15841,7 +15904,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
          }
  
          // Instead of kicking then returning, we need to store the kick reason
-@@ -735,7 +802,7 @@ public abstract class PlayerList {
+@@ -733,7 +800,7 @@ public abstract class PlayerList {
  
              ichatmutablecomponent = Component.translatable("multiplayer.disconnect.banned.reason", gameprofilebanentry.getReason());
              if (gameprofilebanentry.getExpires() != null) {
@@ -15850,7 +15913,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
              }
  
              // return chatmessage;
-@@ -748,14 +815,14 @@ public abstract class PlayerList {
+@@ -746,14 +813,14 @@ public abstract class PlayerList {
  
              ichatmutablecomponent = Component.translatable("multiplayer.disconnect.banned_ip.reason", ipbanentry.getReason());
              if (ipbanentry.getExpires() != null) {
@@ -15867,7 +15930,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
                  event.disallow(PlayerLoginEvent.Result.KICK_FULL, net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.serverFullMessage)); // Spigot // Paper - Adventure
              }
          }
-@@ -821,6 +888,11 @@ public abstract class PlayerList {
+@@ -819,6 +886,11 @@ public abstract class PlayerList {
  
      public ServerPlayer respawn(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation, RespawnReason reason, org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag...respawnFlags) {
          // Paper end
@@ -15879,7 +15942,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
          entityplayer.stopRiding(); // CraftBukkit
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
-@@ -1014,10 +1086,10 @@ public abstract class PlayerList {
+@@ -1012,10 +1084,10 @@ public abstract class PlayerList {
      public void tick() {
          if (++this.sendAllPlayerInfoIn > 600) {
              // CraftBukkit start
@@ -15893,7 +15956,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
                      @Override
                      public boolean test(ServerPlayer input) {
                          return target.getBukkitEntity().canSee(input.getBukkitEntity());
-@@ -1043,18 +1115,17 @@ public abstract class PlayerList {
+@@ -1041,18 +1113,17 @@ public abstract class PlayerList {
  
      // CraftBukkit start - add a world/entity limited version
      public void broadcastAll(Packet packet, net.minecraft.world.entity.player.Player entityhuman) {
@@ -15916,17 +15979,17 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
          }
  
      }
-@@ -1098,8 +1169,7 @@ public abstract class PlayerList {
-         if (scoreboardteambase == null) {
+@@ -1096,8 +1167,7 @@ public abstract class PlayerList {
+         if (scoreboardteam == null) {
              this.broadcastSystemMessage(message, false);
          } else {
 -            for (int i = 0; i < this.players.size(); ++i) {
 -                ServerPlayer entityplayer = (ServerPlayer) this.players.get(i);
 +            for (ServerPlayer entityplayer : this.players) { // Folia - region threading
  
-                 if (entityplayer.getTeam() != scoreboardteambase) {
+                 if (entityplayer.getTeam() != scoreboardteam) {
                      entityplayer.sendSystemMessage(message);
-@@ -1110,10 +1180,12 @@ public abstract class PlayerList {
+@@ -1108,10 +1178,12 @@ public abstract class PlayerList {
      }
  
      public String[] getPlayerNamesArray() {
@@ -15942,7 +16005,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
          }
  
          return astring;
-@@ -1132,7 +1204,9 @@ public abstract class PlayerList {
+@@ -1130,7 +1202,9 @@ public abstract class PlayerList {
          ServerPlayer entityplayer = this.getPlayer(profile.getId());
  
          if (entityplayer != null) {
@@ -15952,7 +16015,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
          }
  
      }
-@@ -1142,7 +1216,10 @@ public abstract class PlayerList {
+@@ -1140,7 +1214,10 @@ public abstract class PlayerList {
          ServerPlayer entityplayer = this.getPlayer(profile.getId());
  
          if (entityplayer != null) {
@@ -15963,7 +16026,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
          }
  
      }
-@@ -1203,8 +1280,7 @@ public abstract class PlayerList {
+@@ -1201,8 +1278,7 @@ public abstract class PlayerList {
      }
  
      public void broadcast(@Nullable net.minecraft.world.entity.player.Player player, double x, double y, double z, double distance, ResourceKey<Level> worldKey, Packet<?> packet) {
@@ -15973,7 +16036,7 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
  
              // CraftBukkit start - Test if player receiving packet can see the source of the packet
              if (player != null && !entityplayer.getBukkitEntity().canSee(player.getBukkitEntity())) {
-@@ -1234,12 +1310,21 @@ public abstract class PlayerList {
+@@ -1232,12 +1308,21 @@ public abstract class PlayerList {
          io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
          MinecraftTimings.savePlayers.startTiming(); // Paper
          int numSaved = 0;
@@ -16027,14 +16090,14 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..6cce2a9bc9beeeef25b7bacd2ad307ed
          // Paper start - Remove collideRule team if it exists
 -        if (this.collideRuleTeamName != null) {
 +        if (false && this.collideRuleTeamName != null) { // Folia - region threading
-             final Scoreboard scoreboard = this.getServer().getLevel(Level.OVERWORLD).getScoreboard();
+             final net.minecraft.world.scores.Scoreboard scoreboard = this.getServer().getLevel(Level.OVERWORLD).getScoreboard();
              final PlayerTeam team = scoreboard.getPlayersTeam(this.collideRuleTeamName);
              if (team != null) scoreboard.removePlayerTeam(team);
 diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
-index 09fc086548b9d0f97849f56f41e3a5be87f5091a..4dfb52f7fde8603b9fc236ea57e9b768a9d04fc6 100644
+index 665120a62525f56912263a3e1b6f12f6c3e15dec..d37315eba7c1db671136e913d6c1d73a6995fc8e 100644
 --- a/src/main/java/net/minecraft/server/players/StoredUserList.java
 +++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
-@@ -143,6 +143,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -126,6 +126,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
      }
  
      public void save() throws IOException {
@@ -16042,7 +16105,7 @@ index 09fc086548b9d0f97849f56f41e3a5be87f5091a..4dfb52f7fde8603b9fc236ea57e9b768
          this.removeExpired(); // Paper - remove expired values before saving
          JsonArray jsonarray = new JsonArray();
          Stream<JsonObject> stream = this.map.values().stream().map((jsonlistentry) -> { // CraftBukkit - decompile error
-@@ -173,10 +174,12 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -156,10 +157,12 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
          if (bufferedwriter != null) {
              bufferedwriter.close();
          }
@@ -16055,7 +16118,7 @@ index 09fc086548b9d0f97849f56f41e3a5be87f5091a..4dfb52f7fde8603b9fc236ea57e9b768
          if (this.file.exists()) {
              BufferedReader bufferedreader = Files.newReader(this.file, StandardCharsets.UTF_8);
  
-@@ -233,5 +236,6 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -216,5 +219,6 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
              }
  
          }
@@ -16270,10 +16333,10 @@ index ea27b46eec01bda427653335f922ccd068cffcb5..e551d3b875eab6851b75041f418c9a08
              return blockToFallLocation(blockState);
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26ccbe20c323 100644
+index 9abe817ae202edaa2d88cd59ae5c7db0b1c634be..9f38cec134dfd476d0a8d56b628238d2d27baf83 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -166,7 +166,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -167,7 +167,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      // Paper start
      public static RandomSource SHARED_RANDOM = new RandomRandomSource();
@@ -16282,7 +16345,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
          private boolean locked = false;
  
          @Override
-@@ -240,7 +240,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -241,7 +241,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
      public boolean collisionLoadChunks = false; // Paper
@@ -16291,7 +16354,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
  
      public @org.jetbrains.annotations.Nullable net.minecraft.server.level.ChunkMap.TrackedEntity tracker; // Paper
      public @Nullable Throwable addedToWorldStack; // Paper - entity debug
-@@ -531,6 +531,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -536,6 +536,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          this.teleportTo(worldserver, null);
      }
      // Paper end - make end portalling safe
@@ -16317,7 +16380,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
  
      public boolean isLegacyTrackingEntity = false;
  
-@@ -538,28 +557,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -543,28 +562,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          this.isLegacyTrackingEntity = isLegacyTrackingEntity;
      }
  
@@ -16347,7 +16410,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
      // Paper end - optimise entity tracking
  
      public Entity(EntityType<?> type, Level world) {
-@@ -803,6 +801,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -808,6 +806,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      // CraftBukkit start
      public void postTick() {
@@ -16360,7 +16423,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
          // No clean way to break out of ticking once the entity has been copied to a new world, so instead we move the portalling later in the tick cycle
          if (!(this instanceof ServerPlayer) && this.isAlive()) { // Paper - don't attempt to teleport dead entities
              this.handleNetherPortal();
-@@ -825,7 +829,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -830,7 +834,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          this.walkDistO = this.walkDist;
          this.xRotO = this.getXRot();
          this.yRotO = this.getYRot();
@@ -16369,7 +16432,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
          if (this.canSpawnSprintParticle()) {
              this.spawnSprintParticle();
          }
-@@ -934,11 +938,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -939,11 +943,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  // This will be called every single tick the entity is in lava, so don't throw an event
                  this.setSecondsOnFire(15, false);
              }
@@ -16383,7 +16446,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
              // CraftBukkit end - we also don't throw an event unless the object in lava is living, to save on some event calls
  
          }
-@@ -1083,8 +1087,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1088,8 +1092,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          } else {
              this.wasOnFire = this.isOnFire();
              if (movementType == MoverType.PISTON) {
@@ -16394,7 +16457,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
                  movement = this.limitPistonMovement(movement);
                  if (movement.equals(Vec3.ZERO)) {
                      return;
-@@ -2946,7 +2950,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3001,7 +3005,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  this.passengers = ImmutableList.copyOf(list);
              }
  
@@ -16403,7 +16466,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
          }
      }
  
-@@ -2995,7 +2999,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3050,7 +3054,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              }
  
              entity.boardingCooldown = 60;
@@ -16412,10 +16475,10 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
          }
          return true; // CraftBukkit
      }
-@@ -3275,6 +3279,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3330,6 +3334,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      @Nullable
-     public Team getTeam() {
+     public PlayerTeam getTeam() {
 +        // Folia start - region threading
 +        if (true) {
 +            return null;
@@ -16424,7 +16487,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
          if (!this.level().paperConfig().scoreboards.allowNonPlayerEntitiesOnScoreboards && !(this instanceof Player)) { return null; } // Paper
          return this.level().getScoreboard().getPlayersTeam(this.getScoreboardName());
      }
-@@ -3390,9 +3399,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3445,9 +3454,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          if (this.fireImmune()) {
              return;
          }
@@ -16436,7 +16499,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
              return;
          }
          // CraftBukkit end
-@@ -3565,6 +3574,775 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3620,6 +3629,775 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          this.portalEntrancePos = original.portalEntrancePos;
      }
  
@@ -17212,7 +17275,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
      @Nullable
      public Entity changeDimension(ServerLevel destination) {
          // CraftBukkit start
-@@ -3573,6 +4351,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3628,6 +4406,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      @Nullable
      public Entity teleportTo(ServerLevel worldserver, Vec3 location) {
@@ -17224,7 +17287,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
          // CraftBukkit end
          // Paper start - fix bad state entities causing dupes
          if (!this.isAlive() || !this.valid) {
-@@ -3661,6 +4444,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3720,6 +4503,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          }
      }
  
@@ -17237,7 +17300,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
      protected void removeAfterChangingDimensions() {
          this.setRemoved(Entity.RemovalReason.CHANGED_DIMENSION);
      }
-@@ -4589,7 +5378,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4657,7 +5446,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              }
          }
          // Paper end - fix MC-4
@@ -17247,7 +17310,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
              synchronized (this.posLock) { // Paper
              this.position = new Vec3(x, y, z);
              } // Paper
-@@ -4610,7 +5400,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4678,7 +5468,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
          // Paper start - never allow AABB to become desynced from position
          // hanging has its own special logic
@@ -17256,7 +17319,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
              this.setBoundingBox(this.makeBoundingBox());
          }
          // Paper end
-@@ -4697,6 +5487,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4765,6 +5555,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          return this.removalReason != null;
      }
  
@@ -17269,7 +17332,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
      @Nullable
      public Entity.RemovalReason getRemovalReason() {
          return this.removalReason;
-@@ -4712,6 +5508,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4780,6 +5576,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          }
          // Paper end - rewrite chunk system
          final boolean alreadyRemoved = this.removalReason != null;
@@ -17279,7 +17342,7 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
          if (this.removalReason == null) {
              this.removalReason = reason;
          }
-@@ -4734,6 +5533,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4802,6 +5601,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          this.removalReason = null;
      }
  
@@ -17291,10 +17354,10 @@ index c655c6fee393c62ba79301f76baa72f9b1154a9a..dd18591d7928ab04f6f7c09aa89a26cc
      /**
       * Invoked only when the entity is truly removed from the server, never to be added to any world.
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a76eb3d051db0229ed088b71c92ff3f131449007..db4f220bc9767ced5a98addc9e8b440b4f4f5b03 100644
+index 45b1a182acf6b2aef40b714d31ca125d8f74619a..d74c6ee198daa125d78cd815e1e0d1f7194caeac 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -276,6 +276,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -275,6 +275,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
          ++this.noActionTime; // Above all the floats
      }
      // Spigot end
@@ -17308,7 +17371,7 @@ index a76eb3d051db0229ed088b71c92ff3f131449007..db4f220bc9767ced5a98addc9e8b440b
  
      protected LivingEntity(EntityType<? extends LivingEntity> type, Level world) {
          super(type, world);
-@@ -481,7 +488,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -480,7 +487,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
          if (this.isDeadOrDying() && this.level().shouldTickDeath(this)) {
              this.tickDeath();
@@ -17317,7 +17380,7 @@ index a76eb3d051db0229ed088b71c92ff3f131449007..db4f220bc9767ced5a98addc9e8b440b
  
          if (this.lastHurtByPlayerTime > 0) {
              --this.lastHurtByPlayerTime;
-@@ -627,11 +634,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -626,11 +633,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return true;
      }
  
@@ -17334,7 +17397,7 @@ index a76eb3d051db0229ed088b71c92ff3f131449007..db4f220bc9767ced5a98addc9e8b440b
          }
  
      }
-@@ -852,9 +862,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -851,9 +861,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
  
          this.hurtTime = nbt.getShort("HurtTime");
@@ -17346,16 +17409,15 @@ index a76eb3d051db0229ed088b71c92ff3f131449007..db4f220bc9767ced5a98addc9e8b440b
              String s = nbt.getString("Team");
              PlayerTeam scoreboardteam = this.level().getScoreboard().getPlayerTeam(s);
              if (!this.level().paperConfig().scoreboards.allowNonPlayerEntitiesOnScoreboards && !(this instanceof net.minecraft.world.entity.player.Player)) { scoreboardteam = null; } // Paper
-@@ -1134,7 +1144,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-     }
- 
-     public boolean addEffect(MobEffectInstance mobeffect, @Nullable Entity entity, EntityPotionEffectEvent.Cause cause) {
--        // org.spigotmc.AsyncCatcher.catchOp("effect add"); // Spigot // Paper - move to API
+@@ -1139,6 +1149,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+     public boolean addEffect(MobEffectInstance mobeffect, @Nullable Entity entity, EntityPotionEffectEvent.Cause cause, boolean fireEvent) {
+         // Paper end
+         // org.spigotmc.AsyncCatcher.catchOp("effect add"); // Spigot // Paper - move to API
 +        if (!this.hasNullCallback()) io.papermc.paper.util.TickThread.ensureTickThread(this, "Cannot add effects to entities asynchronously"); // Folia - region threading
          if (this.isTickingEffects) {
              this.effectsToProcess.add(new ProcessableEffect(mobeffect, cause));
              return true;
-@@ -2331,7 +2341,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2336,7 +2347,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      @Nullable
      public LivingEntity getKillCredit() {
@@ -17364,7 +17426,7 @@ index a76eb3d051db0229ed088b71c92ff3f131449007..db4f220bc9767ced5a98addc9e8b440b
      }
  
      public final float getMaxHealth() {
-@@ -3469,7 +3479,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3479,7 +3490,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          this.pushEntities();
          this.level().getProfiler().pop();
          // Paper start
@@ -17373,7 +17435,7 @@ index a76eb3d051db0229ed088b71c92ff3f131449007..db4f220bc9767ced5a98addc9e8b440b
              if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
                  Location from = new Location(this.level().getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
                  Location to = new Location (this.level().getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
-@@ -4163,7 +4173,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4173,7 +4184,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          BlockPos blockposition = BlockPos.containing(d0, d1, d2);
          Level world = this.level();
  
@@ -17383,10 +17445,10 @@ index a76eb3d051db0229ed088b71c92ff3f131449007..db4f220bc9767ced5a98addc9e8b440b
  
              while (!flag2 && blockposition.getY() > world.getMinBuildHeight()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 956d05e2ae59978ea9623ca0e167c0afe0b87306..4e9d510646abbc2d2b6f2d935f7416b6872eb234 100644
+index 5af48151159135b869ec4753bbcf79dd257c1570..51628bf76f80c6ad9d7feb127377f004adce9669 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -136,6 +136,14 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -137,6 +137,14 @@ public abstract class Mob extends LivingEntity implements Targeting {
  
      public boolean aware = true; // CraftBukkit
  
@@ -17401,7 +17463,7 @@ index 956d05e2ae59978ea9623ca0e167c0afe0b87306..4e9d510646abbc2d2b6f2d935f7416b6
      protected Mob(EntityType<? extends Mob> type, Level world) {
          super(type, world);
          this.handItems = NonNullList.withSize(2, ItemStack.EMPTY);
-@@ -287,9 +295,21 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -288,9 +296,21 @@ public abstract class Mob extends LivingEntity implements Targeting {
      @Nullable
      @Override
      public LivingEntity getTarget() {
@@ -17423,7 +17485,7 @@ index 956d05e2ae59978ea9623ca0e167c0afe0b87306..4e9d510646abbc2d2b6f2d935f7416b6
      public org.bukkit.craftbukkit.entity.CraftMob getBukkitMob() { return (org.bukkit.craftbukkit.entity.CraftMob) super.getBukkitEntity(); } // Paper
      public void setTarget(@Nullable LivingEntity target) {
          // CraftBukkit start - fire event
-@@ -297,7 +317,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -298,7 +318,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
      }
  
      public boolean setTarget(LivingEntity entityliving, EntityTargetEvent.TargetReason reason, boolean fireEvent) {
@@ -17432,7 +17494,7 @@ index 956d05e2ae59978ea9623ca0e167c0afe0b87306..4e9d510646abbc2d2b6f2d935f7416b6
          if (fireEvent) {
              if (reason == EntityTargetEvent.TargetReason.UNKNOWN && this.getTarget() != null && entityliving == null) {
                  reason = this.getTarget().isAlive() ? EntityTargetEvent.TargetReason.FORGOT_TARGET : EntityTargetEvent.TargetReason.TARGET_DIED;
-@@ -907,7 +927,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -908,7 +928,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
          this.level().getProfiler().push("sensing");
          this.sensing.tick();
          this.level().getProfiler().pop();
@@ -17441,7 +17503,7 @@ index 956d05e2ae59978ea9623ca0e167c0afe0b87306..4e9d510646abbc2d2b6f2d935f7416b6
  
          if (i % 2 != 0 && this.tickCount > 1) {
              this.level().getProfiler().push("targetSelector");
-@@ -1744,6 +1764,15 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1746,6 +1766,15 @@ public abstract class Mob extends LivingEntity implements Targeting {
          this.goalSelector.removeAllGoals(predicate);
      }
  
@@ -17457,7 +17519,7 @@ index 956d05e2ae59978ea9623ca0e167c0afe0b87306..4e9d510646abbc2d2b6f2d935f7416b6
      @Override
      protected void removeAfterChangingDimensions() {
          super.removeAfterChangingDimensions();
-@@ -1752,12 +1781,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1754,12 +1783,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
          this.level().getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
          this.dropLeash(true, event.isDropLeash());
          // Paper end
@@ -17818,10 +17880,10 @@ index 12a7aaeaa8b4b788b620b1985591c3b93253ccd5..5150d447c9dc2f539446749c8bee1020
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 9a7956befc346e1b58f064213800fd099a052fc6..25fd3aea2d66503018637781ccb8b5690c02e57b 100644
+index a87a34b0c4c8e5d0cf079025c230b1434c919b54..cbb0ebf003f5d832be1937aa886802df3f06b12a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -1036,6 +1036,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -1043,6 +1043,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
  
          @Override
          public boolean canBeeUse() {
@@ -17833,7 +17895,7 @@ index 9a7956befc346e1b58f064213800fd099a052fc6..25fd3aea2d66503018637781ccb8b569
              return Bee.this.hivePos != null && !Bee.this.hasRestriction() && Bee.this.wantsToEnterHive() && !this.hasReachedTarget(Bee.this.hivePos) && Bee.this.level().getBlockState(Bee.this.hivePos).is(BlockTags.BEEHIVES);
          }
  
-@@ -1152,6 +1157,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -1159,6 +1164,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
  
          @Override
          public boolean canBeeUse() {
@@ -17859,10 +17921,10 @@ index de51ce9875e12961e6e549e87d76f492d2f19787..8c9470bc0dd2d1a5bfbdc4921f4063bd
              this.setPersistenceRequired();
          }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index 490472bb618e9ac07da5883a71dff8920525b1e2..28b4be002978f26a3ff9901e9d3dbe860a7d7665 100644
+index d8056421249c8e75e96a55ec07dce84d2bba9c5c..68e8e82f4c3406b1ed5c079e68806f893e5f3e5e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-@@ -341,9 +341,9 @@ public class Turtle extends Animal {
+@@ -336,9 +336,9 @@ public class Turtle extends Animal {
  
      @Override
      public void thunderHit(ServerLevel world, LightningBolt lightning) {
@@ -17875,10 +17937,10 @@ index 490472bb618e9ac07da5883a71dff8920525b1e2..28b4be002978f26a3ff9901e9d3dbe86
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-index 759ecd79534a7706f7d4a63eb9dacbefcfe54674..0344b1f77f23274c2932b5dce01b0ea6887078cf 100644
+index 69912c5b300b67394dce3876d2d96872033cf156..19e8b2d13c627281be3b66ecc56194b3fbc9a39d 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-@@ -303,8 +303,10 @@ public class ItemFrame extends HangingEntity {
+@@ -298,8 +298,10 @@ public class ItemFrame extends HangingEntity {
              MapItemSavedData worldmap = MapItem.getSavedData(i, this.level());
  
              if (worldmap != null) {
@@ -17890,7 +17952,7 @@ index 759ecd79534a7706f7d4a63eb9dacbefcfe54674..0344b1f77f23274c2932b5dce01b0ea6
  
          });
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index e6f75a9cac46c8e3ddba664a9d5b27b665a94cb4..8e348099d6b3eb4510405d76453d70e7cadeebf6 100644
+index 45c07733f03b5c11f6d8e820f65dc950c70d9a67..acf2bfe7421774c1a8d8ac1a23b34880df6cab6a 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -295,9 +295,9 @@ public class FallingBlockEntity extends Entity {
@@ -17906,10 +17968,10 @@ index e6f75a9cac46c8e3ddba664a9d5b27b665a94cb4..8e348099d6b3eb4510405d76453d70e7
                  boolean flag = this.blockState.is(BlockTags.ANVIL);
  
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index eb0351aa12eebcefab1d1d14641fc3c60cbbcab8..ff4d2676a0833977dd8406d49dc0b5035c468b2d 100644
+index a39db702063887cf530f272deaf4f334047cc7d4..f640dca8837496f9603d6d3115dd1d935bd692fd 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -52,7 +52,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -54,7 +54,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
      @Nullable
      public UUID target;
      public final float bobOffs;
@@ -17918,7 +17980,7 @@ index eb0351aa12eebcefab1d1d14641fc3c60cbbcab8..ff4d2676a0833977dd8406d49dc0b503
      public boolean canMobPickup = true; // Paper
      private int despawnRate = -1; // Paper
      public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper
-@@ -126,13 +126,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -144,13 +144,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
              this.discard();
          } else {
              super.tick();
@@ -17937,7 +17999,7 @@ index eb0351aa12eebcefab1d1d14641fc3c60cbbcab8..ff4d2676a0833977dd8406d49dc0b503
  
              this.xo = this.getX();
              this.yo = this.getY();
-@@ -186,11 +184,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -204,11 +202,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
                  this.mergeWithNeighbours();
              }
  
@@ -17951,7 +18013,7 @@ index eb0351aa12eebcefab1d1d14641fc3c60cbbcab8..ff4d2676a0833977dd8406d49dc0b503
  
              this.hasImpulse |= this.updateInWaterStateAndDoFluidPushing();
              if (!this.level().isClientSide) {
-@@ -217,13 +215,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -235,13 +233,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
      // Spigot start - copied from above
      @Override
      public void inactiveTick() {
@@ -17973,7 +18035,7 @@ index eb0351aa12eebcefab1d1d14641fc3c60cbbcab8..ff4d2676a0833977dd8406d49dc0b503
  
          if (!this.level().isClientSide && this.age >= this.despawnRate) { // Spigot // Paper
              // CraftBukkit start - fire ItemDespawnEvent
-@@ -529,14 +528,20 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -548,14 +547,20 @@ public class ItemEntity extends Entity implements TraceableEntity {
          return false;
      }
  
@@ -17998,10 +18060,10 @@ index eb0351aa12eebcefab1d1d14641fc3c60cbbcab8..ff4d2676a0833977dd8406d49dc0b503
          return entity;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 4ce3e69970dd9eb251d0538a2d233ca30e9e5e47..acb7545a3346758c7a598b104ea7ae43ce4263d2 100644
+index c3e47426382296d650fa00ce0bc1a82bf23c7877..3163a74e8225a64d763e5a8f0787240280a5116c 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -63,7 +63,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+@@ -71,7 +71,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
  
      @Override
      public void tick() {
@@ -18010,7 +18072,7 @@ index 4ce3e69970dd9eb251d0538a2d233ca30e9e5e47..acb7545a3346758c7a598b104ea7ae43
          if (!this.isNoGravity()) {
              this.setDeltaMovement(this.getDeltaMovement().add(0.0D, -0.04D, 0.0D));
          }
-@@ -105,7 +105,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+@@ -113,7 +113,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
               */
              // Send position and velocity updates to nearby players on every tick while the TNT is in water.
              // This does pretty well at keeping their clients in sync with the server.
@@ -18020,10 +18082,10 @@ index 4ce3e69970dd9eb251d0538a2d233ca30e9e5e47..acb7545a3346758c7a598b104ea7ae43
                  net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket velocityPacket = new net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket(this);
                  net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket positionPacket = new net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
-index 90e577b1a89b02c38daff2845a63dafe5ed929e1..150fb1fc4d70330a4c56ff5847792a1eb84af633 100644
+index 30ea3f64234fd1fda8dada3c7fb12be0730322a8..395c7763db5f748911639336e3274d4cb16d66f8 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
-@@ -359,7 +359,7 @@ public class Vex extends Monster implements TraceableEntity {
+@@ -370,7 +370,7 @@ public class Vex extends Monster implements TraceableEntity {
          public void tick() {
              BlockPos blockposition = Vex.this.getBoundOrigin();
  
@@ -18033,7 +18095,7 @@ index 90e577b1a89b02c38daff2845a63dafe5ed929e1..150fb1fc4d70330a4c56ff5847792a1e
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 5fdad1600cc7a7c22d1d9a58b6b2dda605521b97..e2b9a18fd4a573aa2b3299a2e19afc07cc747366 100644
+index 753defa8f8b48d004a2a53b2fc322fd9c083d95e..07025fb304b5ac3ae7c4362fe61560d22caabf1b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -95,7 +95,7 @@ public class Zombie extends Monster {
@@ -18162,7 +18224,7 @@ index 5f407535298a31a34cfe114dd863fd6a9b977707..cb0f75fb32836efa50f0a86dfae7907b
                      return 0;
                  } else {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index cbe2a37f74f4fb2abd0b3297699e54335aaed64f..4e9ccc518f37755e86687653f7724240db754682 100644
+index 11935e5b16324af572b07c5b173708f5a91f8289..c8de034a2bf4654bad9a6e8a9aa831b2f90fad14 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -203,7 +203,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -18285,10 +18347,10 @@ index 8385eb1d60f377da94e3178ab506feefb43563fd..2f57e5025d0a0e720f49da1e5231a7d9
                      entityvillagertrader.setWanderTarget(blockposition1);
                      entityvillagertrader.restrictTo(blockposition1, 16);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 481c3e321cfc0f20bb1c4c6942b8bdbd23c06339..51c31ac3d54996a6e2d870d8215546fdcf5ee506 100644
+index 7f3466340891b4409d1399ebeb2ca865d77841cd..4269226b2bea166599934a25d70376f905f33db6 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1508,6 +1508,14 @@ public abstract class Player extends LivingEntity {
+@@ -1503,6 +1503,14 @@ public abstract class Player extends LivingEntity {
  
      }
  
@@ -18304,10 +18366,10 @@ index 481c3e321cfc0f20bb1c4c6942b8bdbd23c06339..51c31ac3d54996a6e2d870d8215546fd
          return false;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 6c176933967f6ee98da3026f16a10efe4c3842fe..1b919bda12fb6c4bbad8cd477dbcbe520655b346 100644
+index 42ebd91196ae420eee57f4380abc558555457163..f7cc9b8b4fbdaeb48c45eaa574e79e4796007b61 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -149,6 +149,11 @@ public abstract class AbstractArrow extends Projectile {
+@@ -156,6 +156,11 @@ public abstract class AbstractArrow extends Projectile {
      @Override
      public void tick() {
          super.tick();
@@ -18320,10 +18382,10 @@ index 6c176933967f6ee98da3026f16a10efe4c3842fe..1b919bda12fb6c4bbad8cd477dbcbe52
          Vec3 vec3d = this.getDeltaMovement();
  
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
-index 6c9a8f062f989db022154155e8a05b334a0510da..77f55bcb120295fa11140681f63175d37d8a78e2 100644
+index c4ecc5faa4f61e7974e8c475762924a89615b377..40489886060782681f960d1c4eab36981279b76b 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
-@@ -77,6 +77,11 @@ public abstract class AbstractHurtingProjectile extends Projectile {
+@@ -88,6 +88,11 @@ public abstract class AbstractHurtingProjectile extends Projectile {
              this.discard();
          } else {
              super.tick();
@@ -18461,10 +18523,10 @@ index 0bbe853f7df93f9dcd2b21d762939f8b6be069aa..4f4d6dedb99feac995e9b5bdf1d5c9f1
          HitResult movingobjectposition = ProjectileUtil.getHitResultOnMoveVector(this, this::canHitEntity);
  
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index a90317100d32974e481e14476843f66997a2cf3a..0c8f90a904c01105ba5fa6a8037150697bc2621e 100644
+index 2f058cec80c6ef7a5a5ca065dc6c9fe353c521de..dd204b547ea0981cf82c567cc497364ee221f09b 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -69,9 +69,20 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -70,9 +70,20 @@ public abstract class Projectile extends Entity implements TraceableEntity {
      }
      // Paper end
  
@@ -18485,14 +18547,15 @@ index a90317100d32974e481e14476843f66997a2cf3a..0c8f90a904c01105ba5fa6a803715069
          if (this.cachedOwner != null && !this.cachedOwner.isRemoved()) {
              this.refreshProjectileSource(false); // Paper
              return this.cachedOwner;
-@@ -296,6 +307,6 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -304,7 +315,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
      public boolean mayInteract(Level world, BlockPos pos) {
          Entity entity = this.getOwner();
  
 -        return entity instanceof Player ? entity.mayInteract(world, pos) : entity == null || world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
 +        return entity instanceof Player && io.papermc.paper.util.TickThread.isTickThreadFor(entity) ? entity.mayInteract(world, pos) : entity == null || world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // Folia - region threading
      }
- }
+ 
+     public boolean mayBreak(Level world) {
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/SmallFireball.java b/src/main/java/net/minecraft/world/entity/projectile/SmallFireball.java
 index 9d43c8520953d6fe0d0948f9dbe14e0650ee01c2..c7713583930240512cd94f2a6bd1ff819ca6cd48 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/SmallFireball.java
@@ -18523,10 +18586,10 @@ index ab777952bda1651796ed41e8a7fc6621f27db9aa..6b9365eba3339578ee2984605240b74d
          boolean flag = false;
  
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-index f5db60cbecbe69941873e064315931089fe0e48a..39bb4ec91e096cf84221a3bddbf7425023f0f609 100644
+index af4da25c9b13c114179fab3254aea5323210d7da..79c175cbcde3f19854b0221791a6624e75562697 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-@@ -42,6 +42,62 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
+@@ -45,6 +45,62 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
          entityHitResult.getEntity().hurt(this.damageSources().thrown(this, this.getOwner()), 0.0F);
      }
  
@@ -18589,7 +18652,7 @@ index f5db60cbecbe69941873e064315931089fe0e48a..39bb4ec91e096cf84221a3bddbf74250
      @Override
      protected void onHit(HitResult hitResult) {
          super.onHit(hitResult);
-@@ -51,6 +107,20 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
+@@ -54,6 +110,20 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
          }
  
          if (!this.level().isClientSide && !this.isRemoved()) {
@@ -18610,7 +18673,7 @@ index f5db60cbecbe69941873e064315931089fe0e48a..39bb4ec91e096cf84221a3bddbf74250
              Entity entity = this.getOwner();
  
              if (entity instanceof ServerPlayer) {
-@@ -82,9 +152,9 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
+@@ -85,9 +155,9 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
  
                          entityplayer.connection.teleport(teleEvent.getTo());
                          entity.resetFallDistance();
@@ -18621,8 +18684,8 @@ index f5db60cbecbe69941873e064315931089fe0e48a..39bb4ec91e096cf84221a3bddbf74250
 +                        CraftEventFactory.entityDamageRT.set(null); // Folia - region threading
                      }
                      // CraftBukkit end
-                 }
-@@ -110,6 +180,14 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
+                     this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_TELEPORT, SoundSource.PLAYERS);
+@@ -114,6 +184,14 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
  
      }
  
@@ -18851,10 +18914,10 @@ index 42d87800a328f71c5127ce5599ca4c71cc9bb1cd..4b08175b71e7f92e9bb578f9f6c2c0ef
              }
  
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 4697df75fdee2023c41260bed211e3e3d90d2b9b..1a0618422675cbe4ab55a03c85c7bc383efa5cee 100644
+index de277d61b718fe07a87d75a2547bb1c7f8553aa1..5289239d64f1081086d864d047ab688dc3fda924 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -357,31 +357,32 @@ public final class ItemStack {
+@@ -378,31 +378,32 @@ public final class ItemStack {
              CompoundTag oldData = this.getTagClone();
              int oldCount = this.getCount();
              ServerLevel world = (ServerLevel) context.getLevel();
@@ -18896,7 +18959,7 @@ index 4697df75fdee2023c41260bed211e3e3d90d2b9b..1a0618422675cbe4ab55a03c85c7bc38
                  StructureGrowEvent structureEvent = null;
                  if (treeType != null) {
                      boolean isBonemeal = this.getItem() == Items.BONE_MEAL;
-@@ -410,13 +411,13 @@ public final class ItemStack {
+@@ -431,13 +432,13 @@ public final class ItemStack {
                  SignItem.openSign = null; // SPIGOT-6758 - Reset on early return
                  return enuminteractionresult;
              }
@@ -18913,7 +18976,7 @@ index 4697df75fdee2023c41260bed211e3e3d90d2b9b..1a0618422675cbe4ab55a03c85c7bc38
                  if (blocks.size() > 1) {
                      placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockMultiPlaceEvent(world, entityhuman, enumhand, blocks, blockposition.getX(), blockposition.getY(), blockposition.getZ());
                  } else if (blocks.size() == 1 && item != Items.POWDER_SNOW_BUCKET) { // Paper - don't call event twice for snow buckets
-@@ -427,13 +428,13 @@ public final class ItemStack {
+@@ -448,13 +449,13 @@ public final class ItemStack {
                      enuminteractionresult = InteractionResult.FAIL; // cancel placement
                      // PAIL: Remove this when MC-99075 fixed
                      placeEvent.getPlayer().updateInventory();
@@ -18929,8 +18992,8 @@ index 4697df75fdee2023c41260bed211e3e3d90d2b9b..1a0618422675cbe4ab55a03c85c7bc38
 +                    worldData.preventPoiUpdated = false; // Folia - region threading
  
                      // Brute force all possible updates
-                     BlockPos placedPos = ((CraftBlock) placeEvent.getBlock()).getPosition();
-@@ -448,7 +449,7 @@ public final class ItemStack {
+                     // Paper start - don't resync blocks
+@@ -471,7 +472,7 @@ public final class ItemStack {
                          this.setCount(newCount);
                      }
  
@@ -18939,7 +19002,7 @@ index 4697df75fdee2023c41260bed211e3e3d90d2b9b..1a0618422675cbe4ab55a03c85c7bc38
                          world.setBlockEntity(e.getValue());
                      }
  
-@@ -535,8 +536,8 @@ public final class ItemStack {
+@@ -558,8 +559,8 @@ public final class ItemStack {
                      entityhuman.awardStat(Stats.ITEM_USED.get(item));
                  }
              }
@@ -18951,10 +19014,10 @@ index 4697df75fdee2023c41260bed211e3e3d90d2b9b..1a0618422675cbe4ab55a03c85c7bc38
  
              return enuminteractionresult;
 diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java
-index c368b437597edf7e165326727ae778a69c3fcc83..efa947cbd9b5f98ceb6a782a6fd39884e2f0fa8c 100644
+index 797415866a7f182d804f6b8e57ceb07a6ac2a20a..a6269b362964857ad3f97e6e6c2f7574d92d67e3 100644
 --- a/src/main/java/net/minecraft/world/item/MapItem.java
 +++ b/src/main/java/net/minecraft/world/item/MapItem.java
-@@ -103,6 +103,7 @@ public class MapItem extends ComplexItem {
+@@ -95,6 +95,7 @@ public class MapItem extends ComplexItem {
      }
  
      public void update(Level world, Entity entity, MapItemSavedData state) {
@@ -18962,7 +19025,7 @@ index c368b437597edf7e165326727ae778a69c3fcc83..efa947cbd9b5f98ceb6a782a6fd39884
          if (world.dimension() == state.dimension && entity instanceof Player) {
              int i = 1 << state.scale;
              int j = state.centerX;
-@@ -134,9 +135,9 @@ public class MapItem extends ComplexItem {
+@@ -126,9 +127,9 @@ public class MapItem extends ComplexItem {
                              int j2 = (j / i + k1 - 64) * i;
                              int k2 = (k / i + l1 - 64) * i;
                              Multiset<MapColor> multiset = LinkedHashMultiset.create();
@@ -18974,7 +19037,7 @@ index c368b437597edf7e165326727ae778a69c3fcc83..efa947cbd9b5f98ceb6a782a6fd39884
                                  int l2 = 0;
                                  double d1 = 0.0D;
                                  int i3;
-@@ -227,6 +228,7 @@ public class MapItem extends ComplexItem {
+@@ -219,6 +220,7 @@ public class MapItem extends ComplexItem {
              }
  
          }
@@ -18982,7 +19045,7 @@ index c368b437597edf7e165326727ae778a69c3fcc83..efa947cbd9b5f98ceb6a782a6fd39884
      }
  
      private BlockState getCorrectStateForFluidBlock(Level world, BlockState state, BlockPos pos) {
-@@ -243,6 +245,7 @@ public class MapItem extends ComplexItem {
+@@ -235,6 +237,7 @@ public class MapItem extends ComplexItem {
          MapItemSavedData worldmap = MapItem.getSavedData(map, world);
  
          if (worldmap != null) {
@@ -18990,7 +19053,7 @@ index c368b437597edf7e165326727ae778a69c3fcc83..efa947cbd9b5f98ceb6a782a6fd39884
              if (world.dimension() == worldmap.dimension) {
                  int i = 1 << worldmap.scale;
                  int j = worldmap.centerX;
-@@ -317,6 +320,7 @@ public class MapItem extends ComplexItem {
+@@ -309,6 +312,7 @@ public class MapItem extends ComplexItem {
                  }
  
              }
@@ -18998,7 +19061,7 @@ index c368b437597edf7e165326727ae778a69c3fcc83..efa947cbd9b5f98ceb6a782a6fd39884
          }
      }
  
-@@ -326,6 +330,7 @@ public class MapItem extends ComplexItem {
+@@ -318,6 +322,7 @@ public class MapItem extends ComplexItem {
              MapItemSavedData worldmap = MapItem.getSavedData(stack, world);
  
              if (worldmap != null) {
@@ -19006,7 +19069,7 @@ index c368b437597edf7e165326727ae778a69c3fcc83..efa947cbd9b5f98ceb6a782a6fd39884
                  if (entity instanceof Player) {
                      Player entityhuman = (Player) entity;
  
-@@ -335,6 +340,7 @@ public class MapItem extends ComplexItem {
+@@ -327,6 +332,7 @@ public class MapItem extends ComplexItem {
                  if (!worldmap.locked && (selected || entity instanceof Player && ((Player) entity).getOffhandItem() == stack)) {
                      this.update(world, entity, worldmap);
                  }
@@ -19015,10 +19078,10 @@ index c368b437597edf7e165326727ae778a69c3fcc83..efa947cbd9b5f98ceb6a782a6fd39884
              }
          }
 diff --git a/src/main/java/net/minecraft/world/item/MinecartItem.java b/src/main/java/net/minecraft/world/item/MinecartItem.java
-index a33395dc5a94d89b5ab273c7832813b6ff9ea3b7..310c8ebcf05cf5755db1baca8c585eb9a07c7f32 100644
+index 3aa73cd44aa8c86b78c35bc1788e4f83018c49ed..cfead7686da25d2cd9203256962170d7a2d77289 100644
 --- a/src/main/java/net/minecraft/world/item/MinecartItem.java
 +++ b/src/main/java/net/minecraft/world/item/MinecartItem.java
-@@ -69,7 +69,7 @@ public class MinecartItem extends Item {
+@@ -70,7 +70,7 @@ public class MinecartItem extends Item {
              CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
  
              BlockDispenseEvent event = new BlockDispenseEvent(block2, craftItem.clone(), new org.bukkit.util.Vector(d0, d1 + d3, d2));
@@ -19028,7 +19091,7 @@ index a33395dc5a94d89b5ab273c7832813b6ff9ea3b7..310c8ebcf05cf5755db1baca8c585eb9
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
-index ceeedbd88c56c08ec8b047c9ca2f14cc581e12ad..19cb22df8eb29d1708e3da2124de3b43378b575a 100644
+index d4ff8c6b7801e33be4ff69b8bae13c09f4872c4b..b7ee6b31d03cd554b229b440b1d5ef6c9ddd2fb5 100644
 --- a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
 +++ b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
 @@ -20,7 +20,7 @@ import net.minecraft.world.phys.Vec3;
@@ -19158,28 +19221,28 @@ index aaa07fcd4b32fe0de88142ab30378327a01f1729..08884cc7d787887b470e90897838969d
                  return player;
              }
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 45243249a561440512ef2a620c60b02e159c80e2..f875a15db0d437a32062c626fb7e42fdcc6cbfde 100644
+index 9442f58dff89ec843c321533965fbee2727d02f8..2a2ea56384bbbd5d7800c3f4c1eb56cd03ef0ec1 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -566,7 +566,7 @@ public class Explosion {
-                             continue;
-                         }
+@@ -584,7 +584,7 @@ public class Explosion {
+                                 continue;
+                             }
  
--                        CraftEventFactory.entityDamage = this.source;
-+                        CraftEventFactory.entityDamageRT.set(this.source); // Folia - region threading
-                         entity.lastDamageCancelled = false;
+-                            CraftEventFactory.entityDamage = this.source;
++                            CraftEventFactory.entityDamageRT.set(this.source); // Folia - region threading
+                             entity.lastDamageCancelled = false;
  
-                         if (entity instanceof EnderDragon) {
-@@ -582,7 +582,7 @@ public class Explosion {
-                             entity.hurt(this.getDamageSource(), (float) ((int) ((d13 * d13 + d13) / 2.0D * 7.0D * (double) f2 + 1.0D)));
-                         }
+                             if (entity instanceof EnderDragon) {
+@@ -598,7 +598,7 @@ public class Explosion {
+                                 entity.hurt(this.damageSource, this.damageCalculator.getEntityDamageAmount(this, entity, getSeenFraction(vec3d, entity, blockCache, blockPos))); // Paper - actually optimise explosions
+                             }
  
--                        CraftEventFactory.entityDamage = null;
-+                        CraftEventFactory.entityDamageRT.set(null); // Folia - region threading
-                         if (entity.lastDamageCancelled) { // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Skip entity if damage event was cancelled
-                             continue;
-                         }
-@@ -852,17 +852,18 @@ public class Explosion {
+-                            CraftEventFactory.entityDamage = null;
++                            CraftEventFactory.entityDamageRT.set(null); // Folia - region threading
+                             if (entity.lastDamageCancelled) { // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Skip entity if damage event was cancelled
+                                 continue;
+                             }
+@@ -854,17 +854,18 @@ public class Explosion {
          if (!this.level.paperConfig().environment.optimizeExplosions) {
              return this.getSeenFraction(vec3d, entity, blockCache, blockPos); // Paper - optimise explosions
          }
@@ -19202,10 +19265,10 @@ index 45243249a561440512ef2a620c60b02e159c80e2..f875a15db0d437a32062c626fb7e42fd
          private final double posX, posY, posZ;
          private final double minX, minY, minZ;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dce6840a31 100644
+index 0b56e5f7f18fc4286992af22d402205b771165a3..91f17ee2b6c9e1413b5bef62adcfe2a0d9537fef 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -117,10 +117,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -120,10 +120,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public static final int TICKS_PER_DAY = 24000;
      public static final int MAX_ENTITY_SPAWN_Y = 20000000;
      public static final int MIN_ENTITY_SPAWN_Y = -20000000;
@@ -19220,7 +19283,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
      public final Thread thread;
      private final boolean isDebug;
      private int skyDarken;
-@@ -130,7 +130,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -133,7 +133,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public float rainLevel;
      protected float oThunderLevel;
      public float thunderLevel;
@@ -19229,7 +19292,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
      /** @deprecated */
      @Deprecated
      private final RandomSource threadSafeRandom = RandomSource.createThreadSafe();
-@@ -144,7 +144,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -147,7 +147,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      private final ResourceKey<Level> dimension;
      private final RegistryAccess registryAccess;
      private final DamageSources damageSources;
@@ -19238,7 +19301,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
  
      // CraftBukkit start Added the following
      private final CraftWorld world;
-@@ -153,20 +153,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -156,20 +156,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public org.bukkit.generator.ChunkGenerator generator;
      public static final boolean DEBUG_ENTITIES = Boolean.getBoolean("debug.entities"); // Paper
  
@@ -19262,7 +19325,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
      public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
      // Paper start
      private final io.papermc.paper.configuration.WorldConfiguration paperConfig;
-@@ -180,9 +170,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -183,9 +173,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
      private org.spigotmc.TickLimiter tileLimiter;
@@ -19275,7 +19338,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
  
      // Paper start - fix and optimise world upgrading
      // copied from below
-@@ -210,6 +200,33 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -213,6 +203,33 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      public abstract ResourceKey<LevelStem> getTypeKey();
  
@@ -19309,7 +19372,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
      protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
-@@ -253,7 +270,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -256,7 +273,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          this.thread = Thread.currentThread();
          this.biomeManager = new BiomeManager(this, i);
          this.isDebug = flag1;
@@ -19318,7 +19381,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
          this.registryAccess = iregistrycustom;
          this.damageSources = new DamageSources(iregistrycustom);
          // CraftBukkit start
-@@ -846,8 +863,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -849,8 +866,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      @Nullable
      public final BlockState getBlockStateIfLoaded(BlockPos pos) {
          // CraftBukkit start - tree generation
@@ -19329,7 +19392,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
              if (previous != null) {
                  return previous.getHandle();
              }
-@@ -909,16 +926,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -912,16 +929,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Override
      public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) {
@@ -19351,7 +19414,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
              }
              blockstate.setFlag(flags); // Paper - update the flag also
              blockstate.setData(state);
-@@ -935,10 +954,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -938,10 +957,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
              // CraftBukkit start - capture blockstates
              boolean captured = false;
@@ -19364,7 +19427,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
                  captured = true;
              }
              // CraftBukkit end
-@@ -948,8 +967,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -951,8 +970,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
              if (iblockdata1 == null) {
                  // CraftBukkit start - remove blockstate if failed (or the same)
@@ -19375,7 +19438,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
                  }
                  // CraftBukkit end
                  return false;
-@@ -986,7 +1005,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -989,7 +1008,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  */
  
                  // CraftBukkit start
@@ -19384,7 +19447,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
                      // Modularize client and physic updates
                      // Spigot start
                      try {
-@@ -1036,7 +1055,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1039,7 +1058,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  iblockdata1.updateIndirectNeighbourShapes(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
                  CraftWorld world = ((ServerLevel) this).getWorld();
                  boolean cancelledUpdates = false; // Paper
@@ -19393,7 +19456,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
                      BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftBlockData.fromData(iblockdata));
                      this.getCraftServer().getPluginManager().callEvent(event);
  
-@@ -1050,7 +1069,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1053,7 +1072,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              }
  
              // CraftBukkit start - SPIGOT-5710
@@ -19402,7 +19465,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
                  this.onBlockStateChange(blockposition, iblockdata1, iblockdata2);
              }
              // CraftBukkit end
-@@ -1129,7 +1148,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1132,7 +1151,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Override
      public void neighborShapeChanged(Direction direction, BlockState neighborState, BlockPos pos, BlockPos neighborPos, int flags, int maxUpdateDepth) {
@@ -19411,7 +19474,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
      }
  
      @Override
-@@ -1154,11 +1173,34 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1157,11 +1176,34 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return this.getChunkSource().getLightEngine();
      }
  
@@ -19448,7 +19511,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
              if (previous != null) {
                  return previous.getHandle();
              }
-@@ -1249,7 +1291,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1258,7 +1300,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      public void addBlockEntityTicker(TickingBlockEntity ticker) {
@@ -19457,7 +19520,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
      }
  
      protected void tickBlockEntities() {
-@@ -1257,11 +1299,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1266,11 +1308,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
          gameprofilerfiller.push("blockEntities");
          this.timings.tileEntityPending.startTiming(); // Spigot
@@ -19473,9 +19536,9 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
          this.timings.tileEntityPending.stopTiming(); // Spigot
  
          this.timings.tileEntityTick.startTiming(); // Spigot
-@@ -1270,9 +1311,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1281,9 +1322,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          int tilesThisCycle = 0;
-         var toRemove = new it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet<TickingBlockEntity>(net.minecraft.Util.identityStrategy()); // Paper - use removeAll
+         var toRemove = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<TickingBlockEntity>(); // Paper - use removeAll
          toRemove.add(null);
 -        for (tileTickPosition = 0; tileTickPosition < this.blockEntityTickers.size(); tileTickPosition++) { // Paper - Disable tick limiters
 -            this.tileTickPosition = (this.tileTickPosition < this.blockEntityTickers.size()) ? this.tileTickPosition : 0;
@@ -19485,8 +19548,8 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
              // Spigot start
              if (tickingblockentity == null) {
                  this.getCraftServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash");
-@@ -1289,19 +1329,19 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-             } else if (this.shouldTickBlocksAt(tickingblockentity.getPos())) {
+@@ -1300,19 +1340,19 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+             } else if (flag && this.shouldTickBlocksAt(tickingblockentity.getPos())) {
                  tickingblockentity.tick();
                  // Paper start - execute chunk tasks during tick
 -                if ((this.tileTickPosition & 7) == 0) {
@@ -19510,7 +19573,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
      }
  
      public <T extends Entity> void guardEntityTick(Consumer<T> tickConsumer, T entity) {
-@@ -1314,7 +1354,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1325,7 +1365,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
              MinecraftServer.LOGGER.error(msg, throwable);
              getCraftServer().getPluginManager().callEvent(new ServerExceptionEvent(new ServerInternalException(msg, throwable)));
@@ -19520,7 +19583,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
              // Paper end
          }
      }
-@@ -1407,9 +1448,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1425,9 +1466,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Nullable
      public BlockEntity getBlockEntity(BlockPos blockposition, boolean validate) {
@@ -19536,7 +19599,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
              return blockEntity;
          }
          // Paper end
-@@ -1422,8 +1468,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1440,8 +1486,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
          if (!this.isOutsideBuildHeight(blockposition)) {
              // CraftBukkit start
@@ -19547,7 +19610,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
                  return;
              }
              // CraftBukkit end
-@@ -1503,6 +1549,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1521,6 +1567,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Override
      public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
@@ -19555,7 +19618,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
          this.getProfiler().incrementCounter("getEntities");
          List<Entity> list = Lists.newArrayList();
          ((ServerLevel)this).getEntityLookup().getEntities(except, box, list, predicate); // Paper - optimise this call
-@@ -1522,6 +1569,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1540,6 +1587,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      public <T extends Entity> void getEntities(EntityTypeTest<Entity, T> filter, AABB box, Predicate<? super T> predicate, List<? super T> result, int limit) {
@@ -19563,7 +19626,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
          this.getProfiler().incrementCounter("getEntities");
          // Paper start - optimise this call
          //TODO use limit
-@@ -1559,13 +1607,30 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1577,13 +1625,30 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      public void disconnect() {}
  
@@ -19596,7 +19659,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
  
      public boolean mayInteract(Player player, BlockPos pos) {
          return true;
-@@ -1767,8 +1832,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1787,8 +1852,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
      public final BlockPos.MutableBlockPos getRandomBlockPosition(int x, int y, int z, int l, BlockPos.MutableBlockPos out) {
          // Paper end
@@ -19606,7 +19669,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
  
          out.set(x + (i1 & 15), y + (i1 >> 16 & l), z + (i1 >> 8 & 15)); // Paper - change to setValues call
          return out; // Paper
-@@ -1799,7 +1863,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1819,7 +1883,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Override
      public long nextSubTickCount() {
@@ -19616,7 +19679,7 @@ index 2354a0e5d15e9be633d9fe3a1a9feefe7b9b7782..2329d08c736ab04f640b0baef3a0d3dc
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/LevelAccessor.java b/src/main/java/net/minecraft/world/level/LevelAccessor.java
-index 73d1adc5ddf0363966eac0c77c8dfbbb20a2b6a3..375a2b57bcb29458443c1a4e2be3c0e5f4e6019c 100644
+index bd9ac874b2d4333bc5c3a79657d63f1bd41fd8c8..f706159a85fe463806b44c768dc9d438a6a1d958 100644
 --- a/src/main/java/net/minecraft/world/level/LevelAccessor.java
 +++ b/src/main/java/net/minecraft/world/level/LevelAccessor.java
 @@ -35,12 +35,22 @@ public interface LevelAccessor extends CommonLevelAccessor, LevelTimeAccess {
@@ -19753,10 +19816,10 @@ index 09c85ed428b8eaf51f8b3c6e45cce925f05ab354..3d797880b5964dd07f3757495ea1255a
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index d40500f9a807cab0b2fb6fa9032f33f4fb74c895..824d89c2c70c64f6b37155dcc2aa0f7bd34d0303 100644
+index 04b1aa22ac1df39d274f27d9c93e0492a8a673f8..2599e0f62ef172340c54c80c997f7a652faddedb 100644
 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-@@ -357,7 +357,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
+@@ -367,7 +367,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
  
              world.setBlock(blockposition1, (BlockState) state.setValue(BedBlock.PART, BedPart.HEAD), 3);
              // CraftBukkit start - SPIGOT-7315: Don't updated if we capture block states
@@ -19766,10 +19829,10 @@ index d40500f9a807cab0b2fb6fa9032f33f4fb74c895..824d89c2c70c64f6b37155dcc2aa0f7b
              }
              // CraftBukkit end
 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 d4cbff18adb62073a1dceb189043789620af6877..4ddc3484311f9c83a6f8aecb89188195ab281742 100644
+index 4d50dd92a7f3187ee1d8edb926e7c273c8156549..c98a6875f72d067de65f4cff05818ee3f0b3d90f 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -382,8 +382,8 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -389,8 +389,8 @@ public class Block extends BlockBehaviour implements ItemLike {
  
              entityitem.setDefaultPickUpDelay();
              // CraftBukkit start
@@ -19781,10 +19844,10 @@ index d4cbff18adb62073a1dceb189043789620af6877..4ddc3484311f9c83a6f8aecb89188195
                  world.addFreshEntity(entityitem);
              }
 diff --git a/src/main/java/net/minecraft/world/level/block/BushBlock.java b/src/main/java/net/minecraft/world/level/block/BushBlock.java
-index 03fde6e47c4a347c62fe9b4a3351769aedf874f6..d2e3e1d20d60f5edd0d93709b808f812c31e7491 100644
+index bed3d9c781c7d3ca260027b4737970889a54689c..46c81d73813c6607d95062358e6e3cd05ffe3192 100644
 --- a/src/main/java/net/minecraft/world/level/block/BushBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BushBlock.java
-@@ -24,7 +24,7 @@ public class BushBlock extends Block {
+@@ -28,7 +28,7 @@ public abstract class BushBlock extends Block {
      public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
          // CraftBukkit start
          if (!state.canSurvive(world, pos)) {
@@ -19794,10 +19857,10 @@ index 03fde6e47c4a347c62fe9b4a3351769aedf874f6..d2e3e1d20d60f5edd0d93709b808f812
              }
          }
 diff --git a/src/main/java/net/minecraft/world/level/block/CactusBlock.java b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-index 0003fb51ae3a6575575e10b4c86719f3061e2577..362aab7977f636fa8a8548a01ab333da066fbc76 100644
+index a9629a102c4fa4e5720e63fcf4590e9231426c62..5ae6509b3f4d66fece987bd5c39426c402dcca74 100644
 --- a/src/main/java/net/minecraft/world/level/block/CactusBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-@@ -115,9 +115,9 @@ public class CactusBlock extends Block {
+@@ -122,9 +122,9 @@ public class CactusBlock extends Block {
      @Override
      public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
          if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper
@@ -19810,10 +19873,10 @@ index 0003fb51ae3a6575575e10b4c86719f3061e2577..362aab7977f636fa8a8548a01ab333da
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/CampfireBlock.java b/src/main/java/net/minecraft/world/level/block/CampfireBlock.java
-index 7700461b8cd0bde1bf6c0d5e4b73184bed1adc4e..479f571152ebb17315b294469658665b6a4e0c12 100644
+index 7302d07c6ff69608e75ac52fdb19f2ec1d105129..cdd0c10fea2684c70bb2295ff6bc2ea8f303cc58 100644
 --- a/src/main/java/net/minecraft/world/level/block/CampfireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CampfireBlock.java
-@@ -95,9 +95,9 @@ public class CampfireBlock extends BaseEntityBlock implements SimpleWaterloggedB
+@@ -110,9 +110,9 @@ public class CampfireBlock extends BaseEntityBlock implements SimpleWaterloggedB
      public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
          if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper
          if ((Boolean) state.getValue(CampfireBlock.LIT) && entity instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity) entity)) {
@@ -19826,10 +19889,10 @@ index 7700461b8cd0bde1bf6c0d5e4b73184bed1adc4e..479f571152ebb17315b294469658665b
  
          super.entityInside(state, world, pos, entity);
 diff --git a/src/main/java/net/minecraft/world/level/block/DaylightDetectorBlock.java b/src/main/java/net/minecraft/world/level/block/DaylightDetectorBlock.java
-index c98a7d0cc2fcf993ab05dc9347bfb34a7e1bdde5..db3060021f9e024a6dba93498422d41e9662f68a 100644
+index de6f00d03223939386aa2ccfdec1e696a68313d7..eb7c2c5b762dbadbe9ccbddc37757bdf97ea4bfe 100644
 --- a/src/main/java/net/minecraft/world/level/block/DaylightDetectorBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/DaylightDetectorBlock.java
-@@ -113,7 +113,7 @@ public class DaylightDetectorBlock extends BaseEntityBlock {
+@@ -120,7 +120,7 @@ public class DaylightDetectorBlock extends BaseEntityBlock {
      }
  
      private static void tickEntity(Level world, BlockPos pos, BlockState state, DaylightDetectorBlockEntity blockEntity) {
@@ -19839,19 +19902,19 @@ index c98a7d0cc2fcf993ab05dc9347bfb34a7e1bdde5..db3060021f9e024a6dba93498422d41e
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-index 9b1e51c1d95da885c80c6d05000d83436b7bcfb4..5ff51a42415306907045452c9feff62afe02898e 100644
+index 52e92ffd6bf5d3d721807a0b3a8e2d301951f934..ed6c84ba826ead1071c56923e457aa6e3c26a66b 100644
 --- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-@@ -48,7 +48,7 @@ public class DispenserBlock extends BaseEntityBlock {
+@@ -49,7 +49,7 @@ public class DispenserBlock extends BaseEntityBlock {
          object2objectopenhashmap.defaultReturnValue(new DefaultDispenseItemBehavior());
      });
      private static final int TRIGGER_DURATION = 4;
 -    public static boolean eventFired = false; // CraftBukkit
 +    public static ThreadLocal<Boolean> eventFired = ThreadLocal.withInitial(() -> Boolean.FALSE); // CraftBukkit // Folia - region threading
  
-     public static void registerBehavior(ItemLike provider, DispenseItemBehavior behavior) {
-         DispenserBlock.DISPENSER_REGISTRY.put(provider.asItem(), behavior);
-@@ -99,7 +99,7 @@ public class DispenserBlock extends BaseEntityBlock {
+     @Override
+     public MapCodec<? extends DispenserBlock> codec() {
+@@ -105,7 +105,7 @@ public class DispenserBlock extends BaseEntityBlock {
  
                  if (idispensebehavior != DispenseItemBehavior.NOOP) {
                  if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockPreDispenseEvent(world, pos, itemstack, i)) return; // Paper - BlockPreDispenseEvent is called here
@@ -19861,12 +19924,12 @@ index 9b1e51c1d95da885c80c6d05000d83436b7bcfb4..5ff51a42415306907045452c9feff62a
                  }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
-index 030b38d5d5d2578d6ef482a239ef58787efa3b08..c93a125445107d97db2a647d7b57b5f871d7e97a 100644
+index 81d2140351775ad55546af52eb635ccdc8509d89..c4a5f7af76f60dd708d1ad7b384ec55a2ea7ec76 100644
 --- a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
-@@ -95,7 +95,7 @@ public class DoublePlantBlock extends BushBlock {
+@@ -102,7 +102,7 @@ public class DoublePlantBlock extends BushBlock {
  
-     protected static void preventCreativeDropFromBottomPart(Level world, BlockPos pos, BlockState state, Player player) {
+     protected static void preventDropFromBottomPart(Level world, BlockPos pos, BlockState state, Player player) {
          // CraftBukkit start
 -        if (((net.minecraft.server.level.ServerLevel)world).hasPhysicsEvent && org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPhysicsEvent(world, pos).isCancelled()) { // Paper
 +        if (((net.minecraft.server.level.ServerLevel)world).getCurrentWorldData().hasPhysicsEvent && org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPhysicsEvent(world, pos).isCancelled()) { // Paper // Folia - region threading
@@ -19874,10 +19937,10 @@ index 030b38d5d5d2578d6ef482a239ef58787efa3b08..c93a125445107d97db2a647d7b57b5f8
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/level/block/FungusBlock.java b/src/main/java/net/minecraft/world/level/block/FungusBlock.java
-index 17e9e2efc78cfe8577dbf4e1d6096543ad8b8ac4..37b0f51eb93a331f2d3b33deb4467f65c474b92c 100644
+index 50d7235cf2ef036451db708c45a063d037051ae9..c0433491be43bb8cc6d00e32edf7699a79f7a251 100644
 --- a/src/main/java/net/minecraft/world/level/block/FungusBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FungusBlock.java
-@@ -61,9 +61,9 @@ public class FungusBlock extends BushBlock implements BonemealableBlock {
+@@ -76,9 +76,9 @@ public class FungusBlock extends BushBlock implements BonemealableBlock {
          this.getFeature(world).ifPresent((holder) -> {
              // CraftBukkit start
              if (this == Blocks.WARPED_FUNGUS) {
@@ -19890,10 +19953,10 @@ index 17e9e2efc78cfe8577dbf4e1d6096543ad8b8ac4..37b0f51eb93a331f2d3b33deb4467f65
              // CraftBukkit end
              ((ConfiguredFeature) holder.value()).place(world, world.getChunkSource().getGenerator(), random, pos);
 diff --git a/src/main/java/net/minecraft/world/level/block/HoneyBlock.java b/src/main/java/net/minecraft/world/level/block/HoneyBlock.java
-index 745f33ce496a7ce8c788f24c093b37933a74148a..b81b43635dcf516492ec5edfa385efcdea4f7534 100644
+index b9d89cce40e4cbeaf98eeb85c254db353e573c95..cfdc8a8337053ddef92b572109256d592160d3ae 100644
 --- a/src/main/java/net/minecraft/world/level/block/HoneyBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/HoneyBlock.java
-@@ -80,7 +80,7 @@ public class HoneyBlock extends HalfTransparentBlock {
+@@ -87,7 +87,7 @@ public class HoneyBlock extends HalfTransparentBlock {
      }
  
      private void maybeDoSlideAchievement(Entity entity, BlockPos pos) {
@@ -19903,10 +19966,10 @@ index 745f33ce496a7ce8c788f24c093b37933a74148a..b81b43635dcf516492ec5edfa385efcd
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/LightningRodBlock.java b/src/main/java/net/minecraft/world/level/block/LightningRodBlock.java
-index da3b301a42a93c891d083a6e02d1be8ed35adf1d..f354981843868bf938be0b5ac1ef2ce39fb067ef 100644
+index ec4aaaca2160312452d724dc6639ac8c4fa42ae4..e1f67599724f67f4f1321f219af8099e8c54e9e7 100644
 --- a/src/main/java/net/minecraft/world/level/block/LightningRodBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/LightningRodBlock.java
-@@ -112,7 +112,7 @@ public class LightningRodBlock extends RodBlock implements SimpleWaterloggedBloc
+@@ -119,7 +119,7 @@ public class LightningRodBlock extends RodBlock implements SimpleWaterloggedBloc
  
      @Override
      public void animateTick(BlockState state, Level world, BlockPos pos, RandomSource random) {
@@ -19916,10 +19979,10 @@ index da3b301a42a93c891d083a6e02d1be8ed35adf1d..f354981843868bf938be0b5ac1ef2ce3
          }
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/MagmaBlock.java b/src/main/java/net/minecraft/world/level/block/MagmaBlock.java
-index 1b766045687e4dcded5cbcc50b746c55b9a34e22..a8270d65c22fa979ce53ffeeeadce8d61db397e1 100644
+index 10f5ffacc72a5e0116e2599ca83ee57a5b1ce0eb..64253e85e87c823d5ead285587496f6f8d825a43 100644
 --- a/src/main/java/net/minecraft/world/level/block/MagmaBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/MagmaBlock.java
-@@ -23,9 +23,9 @@ public class MagmaBlock extends Block {
+@@ -30,9 +30,9 @@ public class MagmaBlock extends Block {
      @Override
      public void stepOn(Level world, BlockPos pos, BlockState state, Entity entity) {
          if (!entity.isSteppingCarefully() && entity instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity) entity)) {
@@ -19932,10 +19995,10 @@ index 1b766045687e4dcded5cbcc50b746c55b9a34e22..a8270d65c22fa979ce53ffeeeadce8d6
  
          super.stepOn(world, pos, state, entity);
 diff --git a/src/main/java/net/minecraft/world/level/block/MushroomBlock.java b/src/main/java/net/minecraft/world/level/block/MushroomBlock.java
-index 302c5a6401facf192677b89cc0e9190bb35b1229..63a51676162d8e658cf10f63ff91d450850a4b86 100644
+index 7368c76a01275223a7bd3df1d36e80a15f66edbb..da1444e6ac3dd5d785763126b1e2ab2b96de7ff6 100644
 --- a/src/main/java/net/minecraft/world/level/block/MushroomBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/MushroomBlock.java
-@@ -93,7 +93,7 @@ public class MushroomBlock extends BushBlock implements BonemealableBlock {
+@@ -105,7 +105,7 @@ public class MushroomBlock extends BushBlock implements BonemealableBlock {
              return false;
          } else {
              world.removeBlock(pos, false);
@@ -19945,10 +20008,10 @@ index 302c5a6401facf192677b89cc0e9190bb35b1229..63a51676162d8e658cf10f63ff91d450
                  return true;
              } else {
 diff --git a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-index cd943997f11f5ea5c600fdc6db96043fb0fa713c..7039b27f74b7898e7028cbd67184c6e9ba213e39 100644
+index bd22d3fdecbc992b11073a74d854b7d1b43c3f6a..999e601a369ca6817ea21286d439ffd724a2f769 100644
 --- a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-@@ -141,9 +141,9 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
+@@ -150,9 +150,9 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
      @Override
      public void fallOn(Level world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {
          if (state.getValue(PointedDripstoneBlock.TIP_DIRECTION) == Direction.UP && state.getValue(PointedDripstoneBlock.THICKNESS) == DripstoneThickness.TIP) {
@@ -19961,19 +20024,19 @@ index cd943997f11f5ea5c600fdc6db96043fb0fa713c..7039b27f74b7898e7028cbd67184c6e9
              super.fallOn(world, state, pos, entity, fallDistance);
          }
 diff --git a/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java b/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java
-index 2b054439b7a763d5a3fbb5dbfe197cb9a9a3525c..f695d81a646307846abb490b484f166be2993382 100644
+index 507be06ad51b7a212e28d3ca6680e0e4b00f4233..bf0e67921d96edde46a97543099f9c03634fca11 100644
 --- a/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java
-@@ -67,7 +67,7 @@ public class RedStoneWireBlock extends Block {
+@@ -69,7 +69,7 @@ public class RedStoneWireBlock extends Block {
      });
      private static final float PARTICLE_DENSITY = 0.2F;
      private final BlockState crossState;
 -    public boolean shouldSignal = true;
 +    //public boolean shouldSignal = true; // Folia - region threading - move to regionised world data
  
-     public RedStoneWireBlock(BlockBehaviour.Properties settings) {
-         super(settings);
-@@ -262,7 +262,7 @@ public class RedStoneWireBlock extends Block {
+     @Override
+     public MapCodec<RedStoneWireBlock> codec() {
+@@ -269,7 +269,7 @@ public class RedStoneWireBlock extends Block {
       * Note: Added 'source' argument so as to help determine direction of information flow
       */
      private void updateSurroundingRedstone(Level worldIn, BlockPos pos, BlockState state, BlockPos source) {
@@ -19982,7 +20045,7 @@ index 2b054439b7a763d5a3fbb5dbfe197cb9a9a3525c..f695d81a646307846abb490b484f166b
              turbo.updateSurroundingRedstone(worldIn, pos, state, source);
              return;
          }
-@@ -282,11 +282,11 @@ public class RedStoneWireBlock extends Block {
+@@ -289,11 +289,11 @@ public class RedStoneWireBlock extends Block {
          int i = state.getValue(POWER);
          int j = 0;
          j = this.getPower(j, worldIn.getBlockState(pos2));
@@ -19997,7 +20060,7 @@ index 2b054439b7a763d5a3fbb5dbfe197cb9a9a3525c..f695d81a646307846abb490b484f166b
              // This code is totally redundant to if statements just below the loop.
              if (k > 0 && k > j - 1) {
                  j = k;
-@@ -300,7 +300,7 @@ public class RedStoneWireBlock extends Block {
+@@ -307,7 +307,7 @@ public class RedStoneWireBlock extends Block {
          // redstone wire will be set to 'k'.  If 'k' is already 15, then nothing inside the
          // following loop can affect the power level of the wire.  Therefore, the loop is
          // skipped if k is already 15.
@@ -20006,7 +20069,7 @@ index 2b054439b7a763d5a3fbb5dbfe197cb9a9a3525c..f695d81a646307846abb490b484f166b
              for (Direction enumfacing : Direction.Plane.HORIZONTAL) {
                  BlockPos blockpos = pos1.relative(enumfacing);
                  boolean flag = blockpos.getX() != pos2.getX() || blockpos.getZ() != pos2.getZ();
-@@ -319,7 +319,7 @@ public class RedStoneWireBlock extends Block {
+@@ -326,7 +326,7 @@ public class RedStoneWireBlock extends Block {
              }
          }
  
@@ -20015,7 +20078,7 @@ index 2b054439b7a763d5a3fbb5dbfe197cb9a9a3525c..f695d81a646307846abb490b484f166b
              // The old code would decrement the wire value only by 1 at a time.
              if (l > j) {
                  j = l - 1;
-@@ -403,10 +403,10 @@ public class RedStoneWireBlock extends Block {
+@@ -410,10 +410,10 @@ public class RedStoneWireBlock extends Block {
      }
  
      private int calculateTargetStrength(Level world, BlockPos pos) {
@@ -20028,7 +20091,7 @@ index 2b054439b7a763d5a3fbb5dbfe197cb9a9a3525c..f695d81a646307846abb490b484f166b
          int j = 0;
  
          if (i < 15) {
-@@ -455,7 +455,7 @@ public class RedStoneWireBlock extends Block {
+@@ -462,7 +462,7 @@ public class RedStoneWireBlock extends Block {
      public void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean notify) {
          if (!oldState.is(state.getBlock()) && !world.isClientSide) {
              // Paper start - optimize redstone - replace call to updatePowerStrength
@@ -20037,7 +20100,7 @@ index 2b054439b7a763d5a3fbb5dbfe197cb9a9a3525c..f695d81a646307846abb490b484f166b
                  world.getWireHandler().onWireAdded(pos); // Alternate Current
              } else {
                  this.updateSurroundingRedstone(world, pos, state, null); // vanilla/Eigencraft
-@@ -488,7 +488,7 @@ public class RedStoneWireBlock extends Block {
+@@ -495,7 +495,7 @@ public class RedStoneWireBlock extends Block {
                  }
  
                  // Paper start - optimize redstone - replace call to updatePowerStrength
@@ -20046,7 +20109,7 @@ index 2b054439b7a763d5a3fbb5dbfe197cb9a9a3525c..f695d81a646307846abb490b484f166b
                      world.getWireHandler().onWireRemoved(pos, state); // Alternate Current
                  } else {
                      this.updateSurroundingRedstone(world, pos, state, null); // vanilla/Eigencraft
-@@ -529,7 +529,7 @@ public class RedStoneWireBlock extends Block {
+@@ -536,7 +536,7 @@ public class RedStoneWireBlock extends Block {
          if (!world.isClientSide) {
              // Paper start - optimize redstone (Alternate Current)
              // Alternate Current handles breaking of redstone wires in the WireHandler.
@@ -20055,7 +20118,7 @@ index 2b054439b7a763d5a3fbb5dbfe197cb9a9a3525c..f695d81a646307846abb490b484f166b
                  world.getWireHandler().onWireUpdated(pos);
              } else
              // Paper end
-@@ -545,12 +545,12 @@ public class RedStoneWireBlock extends Block {
+@@ -552,12 +552,12 @@ public class RedStoneWireBlock extends Block {
  
      @Override
      public int getDirectSignal(BlockState state, BlockGetter world, BlockPos pos, Direction direction) {
@@ -20070,7 +20133,7 @@ index 2b054439b7a763d5a3fbb5dbfe197cb9a9a3525c..f695d81a646307846abb490b484f166b
              int i = (Integer) state.getValue(RedStoneWireBlock.POWER);
  
              return i == 0 ? 0 : (direction != Direction.UP && !((RedstoneSide) this.getConnectionState(world, state, pos).getValue((Property) RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(direction.getOpposite()))).isConnected() ? 0 : i);
-@@ -577,7 +577,7 @@ public class RedStoneWireBlock extends Block {
+@@ -584,7 +584,7 @@ public class RedStoneWireBlock extends Block {
  
      @Override
      public boolean isSignalSource(BlockState state) {
@@ -20080,10 +20143,10 @@ index 2b054439b7a763d5a3fbb5dbfe197cb9a9a3525c..f695d81a646307846abb490b484f166b
  
      public static int getColorForPower(int powerLevel) {
 diff --git a/src/main/java/net/minecraft/world/level/block/RedstoneTorchBlock.java b/src/main/java/net/minecraft/world/level/block/RedstoneTorchBlock.java
-index c91535f6c0bbc870fad7e04b9d341783cfcbbd63..660ade166edf1750247e6a02134581de4225f338 100644
+index 6c49962e8f9e2a5fca50b33f3e3fff76fa36f907..aebb26f379cd3bdb39432c8b70c6d382e02070c7 100644
 --- a/src/main/java/net/minecraft/world/level/block/RedstoneTorchBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/RedstoneTorchBlock.java
-@@ -74,10 +74,10 @@ public class RedstoneTorchBlock extends TorchBlock {
+@@ -81,10 +81,10 @@ public class RedstoneTorchBlock extends BaseTorchBlock {
      public void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
          boolean flag = this.hasNeighborSignal(world, pos, state);
          // Paper start
@@ -20096,7 +20159,7 @@ index c91535f6c0bbc870fad7e04b9d341783cfcbbd63..660ade166edf1750247e6a02134581de
                  redstoneUpdateInfos.poll();
              }
          }
-@@ -158,14 +158,14 @@ public class RedstoneTorchBlock extends TorchBlock {
+@@ -165,14 +165,14 @@ public class RedstoneTorchBlock extends BaseTorchBlock {
  
      private static boolean isToggledTooFrequently(Level world, BlockPos pos, boolean addNew) {
          // Paper start
@@ -20114,7 +20177,7 @@ index c91535f6c0bbc870fad7e04b9d341783cfcbbd63..660ade166edf1750247e6a02134581de
          }
  
          int i = 0;
-@@ -187,12 +187,18 @@ public class RedstoneTorchBlock extends TorchBlock {
+@@ -194,12 +194,18 @@ public class RedstoneTorchBlock extends BaseTorchBlock {
  
      public static class Toggle {
  
@@ -20136,19 +20199,19 @@ index c91535f6c0bbc870fad7e04b9d341783cfcbbd63..660ade166edf1750247e6a02134581de
      }
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/SaplingBlock.java b/src/main/java/net/minecraft/world/level/block/SaplingBlock.java
-index 53ac4e618fec3fe384d8a106c521f3eace0b5b35..2724793d0e2e455f81393775adc6ddceb2319fbc 100644
+index 836c86104ed4f0d375330c9123af5d502efefa4d..68bd6dfb3b99b8e524f808effd1299278a9be23c 100644
 --- a/src/main/java/net/minecraft/world/level/block/SaplingBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SaplingBlock.java
-@@ -27,7 +27,7 @@ public class SaplingBlock extends BushBlock implements BonemealableBlock {
+@@ -34,7 +34,7 @@ public class SaplingBlock extends BushBlock implements BonemealableBlock {
      protected static final float AABB_OFFSET = 6.0F;
      protected static final VoxelShape SHAPE = Block.box(2.0D, 0.0D, 2.0D, 14.0D, 12.0D, 14.0D);
-     private final AbstractTreeGrower treeGrower;
+     protected final TreeGrower treeGrower;
 -    public static TreeType treeType; // CraftBukkit
 +    public static final ThreadLocal<TreeType> treeTypeRT = new ThreadLocal<>(); // CraftBukkit // Folia - region threading
  
-     protected SaplingBlock(AbstractTreeGrower generator, BlockBehaviour.Properties settings) {
-         super(settings);
-@@ -53,18 +53,19 @@ public class SaplingBlock extends BushBlock implements BonemealableBlock {
+     @Override
+     public MapCodec<? extends SaplingBlock> codec() {
+@@ -65,18 +65,19 @@ public class SaplingBlock extends BushBlock implements BonemealableBlock {
              world.setBlock(pos, (net.minecraft.world.level.block.state.BlockState) state.cycle(SaplingBlock.STAGE), 4);
          } else {
              // CraftBukkit start
@@ -20177,10 +20240,10 @@ index 53ac4e618fec3fe384d8a106c521f3eace0b5b35..2724793d0e2e455f81393775adc6ddce
                      if (treeType != null) {
                          event = new StructureGrowEvent(location, treeType, false, null, blocks);
 diff --git a/src/main/java/net/minecraft/world/level/block/SpreadingSnowyDirtBlock.java b/src/main/java/net/minecraft/world/level/block/SpreadingSnowyDirtBlock.java
-index 9bbb9f8e917288bb0d11661a1399a05631ebcce0..8d57dc0aa214e14690880f9a58234fff134cf1f1 100644
+index 1acdf9dad2621a20b077c5f88dab5e0f8688a38f..8db4aab2ca8b0f6b5d9c58bea17d2394a7f460d8 100644
 --- a/src/main/java/net/minecraft/world/level/block/SpreadingSnowyDirtBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SpreadingSnowyDirtBlock.java
-@@ -51,7 +51,7 @@ public abstract class SpreadingSnowyDirtBlock extends SnowyDirtBlock {
+@@ -55,7 +55,7 @@ public abstract class SpreadingSnowyDirtBlock extends SnowyDirtBlock {
  
      @Override
      public void randomTick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
@@ -20190,10 +20253,10 @@ index 9bbb9f8e917288bb0d11661a1399a05631ebcce0..8d57dc0aa214e14690880f9a58234fff
          net.minecraft.world.level.chunk.ChunkAccess cachedBlockChunk = world.getChunkIfLoaded(pos);
          if (cachedBlockChunk == null) { // Is this needed?
 diff --git a/src/main/java/net/minecraft/world/level/block/SweetBerryBushBlock.java b/src/main/java/net/minecraft/world/level/block/SweetBerryBushBlock.java
-index 34eb7ba1adb51e394bf46a6f643db3529626d9ec..c9c544f6db4a24d66e81d9ba2929a41507c5d4af 100644
+index f474ae7b3121de701f371b7d88e80086ec07d03d..ce8253c5b9253e5743478c9c75006868dca9cb78 100644
 --- a/src/main/java/net/minecraft/world/level/block/SweetBerryBushBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SweetBerryBushBlock.java
-@@ -85,9 +85,9 @@ public class SweetBerryBushBlock extends BushBlock implements BonemealableBlock
+@@ -92,9 +92,9 @@ public class SweetBerryBushBlock extends BushBlock implements BonemealableBlock
                  double d1 = Math.abs(entity.getZ() - entity.zOld);
  
                  if (d0 >= 0.003000000026077032D || d1 >= 0.003000000026077032D) {
@@ -20206,10 +20269,10 @@ index 34eb7ba1adb51e394bf46a6f643db3529626d9ec..c9c544f6db4a24d66e81d9ba2929a415
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/WitherSkullBlock.java b/src/main/java/net/minecraft/world/level/block/WitherSkullBlock.java
-index 1aa0e921890d600c9274deb923da04e72b12bcc6..daca759793b4a22406fb9c75b5ac9814920d3ac0 100644
+index fb180f0bcd20e51d41cfc924029c0b23d3d26258..3db0727cd8d835e8d1b7b3fab93613d2e97b95ab 100644
 --- a/src/main/java/net/minecraft/world/level/block/WitherSkullBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/WitherSkullBlock.java
-@@ -51,7 +51,7 @@ public class WitherSkullBlock extends SkullBlock {
+@@ -58,7 +58,7 @@ public class WitherSkullBlock extends SkullBlock {
      }
  
      public static void checkSpawn(Level world, BlockPos pos, SkullBlockEntity blockEntity) {
@@ -20481,7 +20544,7 @@ index 65112ec3a6ea1c27f032477720ae74395523012b..7f9022a271e29d0b47bef15359f1b2dc
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 1ec80f9c901dff1c9f29befa5a8e3c3f6f37aaf7..53f70401fbed7f60507559a8e3d6dcd2400a1179 100644
+index 7491e075baebc7d412d35593bb844b200e304447..4e78efa752b18f68f6edf43cef3bc7bee79bb570 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 @@ -50,9 +50,12 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
@@ -20785,13 +20848,13 @@ index 28e3b73507b988f7234cbf29c4024c88180d0aef..c8facee29ee08e0975528083f89b64f0
 +
 +    BlockEntity getTileEntity(); // Folia - region threading
  }
-diff --git a/src/main/java/net/minecraft/world/level/block/grower/AbstractTreeGrower.java b/src/main/java/net/minecraft/world/level/block/grower/AbstractTreeGrower.java
-index a743f36f2682a6b72ffa6644782fc081d1479eb7..f5263a71d97f404c6f6dbd3354a5ed2e98bb71db 100644
---- a/src/main/java/net/minecraft/world/level/block/grower/AbstractTreeGrower.java
-+++ b/src/main/java/net/minecraft/world/level/block/grower/AbstractTreeGrower.java
-@@ -75,51 +75,53 @@ public abstract class AbstractTreeGrower {
+diff --git a/src/main/java/net/minecraft/world/level/block/grower/TreeGrower.java b/src/main/java/net/minecraft/world/level/block/grower/TreeGrower.java
+index 8cb822fed0cda4268f288feae1079a3dc4dc103e..3f53d51960ded5df3b8be12362110f22b3c495b8 100644
+--- a/src/main/java/net/minecraft/world/level/block/grower/TreeGrower.java
++++ b/src/main/java/net/minecraft/world/level/block/grower/TreeGrower.java
+@@ -175,51 +175,53 @@ public final class TreeGrower {
      // CraftBukkit start
-     protected void setTreeType(Holder<ConfiguredFeature<?, ?>> holder) {
+     private void setTreeType(Holder<ConfiguredFeature<?, ?>> holder) {
          ResourceKey<ConfiguredFeature<?, ?>> worldgentreeabstract = holder.unwrapKey().get();
 +        TreeType treeType; // Folia - region threading
          if (worldgentreeabstract == TreeFeatures.OAK || worldgentreeabstract == TreeFeatures.OAK_BEES_005) {
@@ -20863,7 +20926,7 @@ index a743f36f2682a6b72ffa6644782fc081d1479eb7..f5263a71d97f404c6f6dbd3354a5ed2e
 +        SaplingBlock.treeTypeRT.set(treeType); // Folia - region threading
      }
      // CraftBukkit end
- }
+ 
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 index 1ef87580574919796dbba707f44a413ee5c5781b..a595abb43853cd4c3f5886a83527c6cbe4a3e8f7 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
@@ -21285,7 +21348,7 @@ index 598dc0d3a2b9387e76d7e4e19e54c4573a24bc54..8a139bcfc9c3de5793b1b590be6cafaa
          boolean bl2 = this.maxChainedNeighborUpdates >= 0 && this.count >= this.maxChainedNeighborUpdates;
          ++this.count;
 diff --git a/src/main/java/net/minecraft/world/level/saveddata/SavedData.java b/src/main/java/net/minecraft/world/level/saveddata/SavedData.java
-index f9e3a10f91b7b22604cf13d9e7ebdca460aa39ca..92fe26539027ee57b134c1cf3c0686d7182b6fea 100644
+index 697df9a9f050c0130246ce2b08a859965bddf184..6cd6e83e56cd315cf40fce23318df9e07576a8e5 100644
 --- a/src/main/java/net/minecraft/world/level/saveddata/SavedData.java
 +++ b/src/main/java/net/minecraft/world/level/saveddata/SavedData.java
 @@ -13,7 +13,7 @@ import org.slf4j.Logger;
@@ -21506,10 +21569,10 @@ index e4c4948e076cd64686dfd16ae0568fafc1437140..ba531fcd90df266d8d0c2de907fefe99
          }
      }
 diff --git a/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java b/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
-index f921f55e815a4da01828e025881a7a03591c3978..844226e119a9277741972cddf340bceb59b6cda7 100644
+index d051e8c1db6b5c42b8df0be54d9d48ba0e7b0077..c5650a1a5a728a4b632e03852f7c8262b9e5b491 100644
 --- a/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
 +++ b/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
-@@ -35,6 +35,7 @@ public class DimensionDataStorage {
+@@ -36,6 +36,7 @@ public class DimensionDataStorage {
      }
  
      public <T extends SavedData> T computeIfAbsent(SavedData.Factory<T> type, String id) {
@@ -21517,7 +21580,7 @@ index f921f55e815a4da01828e025881a7a03591c3978..844226e119a9277741972cddf340bceb
          T savedData = this.get(type, id);
          if (savedData != null) {
              return savedData;
-@@ -43,10 +44,12 @@ public class DimensionDataStorage {
+@@ -44,10 +45,12 @@ public class DimensionDataStorage {
              this.set(id, savedData2);
              return savedData2;
          }
@@ -21525,12 +21588,12 @@ index f921f55e815a4da01828e025881a7a03591c3978..844226e119a9277741972cddf340bceb
      }
  
      @Nullable
-     public <T extends SavedData> T get(SavedData.Factory type, String id) {
+     public <T extends SavedData> T get(SavedData.Factory<T> type, String id) {
 +        synchronized (this.cache) { // Folia - make map data thread-safe
          SavedData savedData = this.cache.get(id);
          if (savedData == null && !this.cache.containsKey(id)) {
              savedData = this.readSavedData(type.deserializer(), type.type(), id);
-@@ -54,6 +57,7 @@ public class DimensionDataStorage {
+@@ -55,6 +58,7 @@ public class DimensionDataStorage {
          }
  
          return (T)savedData;
@@ -21538,7 +21601,7 @@ index f921f55e815a4da01828e025881a7a03591c3978..844226e119a9277741972cddf340bceb
      }
  
      @Nullable
-@@ -72,7 +76,9 @@ public class DimensionDataStorage {
+@@ -73,7 +77,9 @@ public class DimensionDataStorage {
      }
  
      public void set(String id, SavedData state) {
@@ -21680,10 +21743,10 @@ index 1d7c663fa0e550bd0cfb9a4b83ccd7e2968666f0..f3df9c9b6cff85565514f990597f3fe5
          LevelChunkTicks<T> levelChunkTicks = this.allContainers.get(l);
          if (levelChunkTicks == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bbc51ebf0dc0801ace9d5e7875fb2fe100b286bc..541915675dd3ad832992360283e3ba1b3cc62e27 100644
+index f4ba1b9adbd0e526421a755fd6c536fe20ffa716..d2c8ad04c59035449dc798a637acc6e809d35fc4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -311,7 +311,7 @@ public final class CraftServer implements Server {
+@@ -312,7 +312,7 @@ public final class CraftServer implements Server {
      private final CraftPotionBrewer potionBrewer = new CraftPotionBrewer(); // Paper
  
      // Paper start - Folia region threading API
@@ -21692,7 +21755,7 @@ index bbc51ebf0dc0801ace9d5e7875fb2fe100b286bc..541915675dd3ad832992360283e3ba1b
      private final io.papermc.paper.threadedregions.scheduler.FoliaAsyncScheduler asyncScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaAsyncScheduler();
      private final io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler globalRegionScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler();
  
-@@ -379,6 +379,12 @@ public final class CraftServer implements Server {
+@@ -380,6 +380,12 @@ public final class CraftServer implements Server {
          return io.papermc.paper.util.TickThread.isTickThreadFor(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandleRaw());
      }
      // Paper end - Folia reagion threading API
@@ -21705,7 +21768,7 @@ index bbc51ebf0dc0801ace9d5e7875fb2fe100b286bc..541915675dd3ad832992360283e3ba1b
  
      static {
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
-@@ -963,6 +969,9 @@ public final class CraftServer implements Server {
+@@ -958,6 +964,9 @@ public final class CraftServer implements Server {
  
      // NOTE: Should only be called from DedicatedServer.ah()
      public boolean dispatchServerCommand(CommandSender sender, ConsoleInput serverCommand) {
@@ -21715,7 +21778,7 @@ index bbc51ebf0dc0801ace9d5e7875fb2fe100b286bc..541915675dd3ad832992360283e3ba1b
          if (sender instanceof Conversable) {
              Conversable conversable = (Conversable) sender;
  
-@@ -982,12 +991,44 @@ public final class CraftServer implements Server {
+@@ -977,12 +986,44 @@ public final class CraftServer implements Server {
          }
      }
  
@@ -21760,7 +21823,7 @@ index bbc51ebf0dc0801ace9d5e7875fb2fe100b286bc..541915675dd3ad832992360283e3ba1b
          if (this.commandMap.dispatch(sender, commandLine)) {
              return true;
          }
-@@ -3171,7 +3212,7 @@ public final class CraftServer implements Server {
+@@ -3203,7 +3244,7 @@ public final class CraftServer implements Server {
  
      @Override
      public int getCurrentTick() {
@@ -21770,10 +21833,10 @@ index bbc51ebf0dc0801ace9d5e7875fb2fe100b286bc..541915675dd3ad832992360283e3ba1b
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb80dd15c5 100644
+index e1fad381b861471a17529c246bb8a4a9c7646420..a0eeba6f3b55e5fc0f5f92a1b7bee4f721910f63 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -184,7 +184,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -187,7 +187,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public int getTickableTileEntityCount() {
@@ -21782,7 +21845,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
      }
  
      @Override
-@@ -240,7 +240,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -249,7 +249,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          // Paper start - per world spawn limits
          for (SpawnCategory spawnCategory : SpawnCategory.values()) {
              if (CraftSpawnCategory.isValidForLimits(spawnCategory)) {
@@ -21791,7 +21854,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
              }
          }
          // Paper end
-@@ -327,6 +327,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -336,6 +336,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public Chunk getChunkAt(int x, int z) {
@@ -21799,7 +21862,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          warnUnsafeChunk("getting a faraway chunk", x, z); // Paper
          // Paper start - add ticket to hold chunk for a little while longer if plugin accesses it
          net.minecraft.world.level.chunk.LevelChunk chunk = this.world.getChunkSource().getChunkAtIfLoadedImmediately(x, z);
-@@ -350,7 +351,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -359,7 +360,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      // Paper start
      private void addTicket(int x, int z) {
@@ -21808,7 +21871,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
      }
      // Paper end
  
-@@ -369,10 +370,10 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -378,10 +379,10 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      public boolean isChunkGenerated(int x, int z) {
          // Paper start - Fix this method
@@ -21821,7 +21884,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          }
          ChunkAccess chunk = world.getChunkSource().getChunkAtImmediately(x, z);
          if (chunk == null) {
-@@ -426,7 +427,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -435,7 +436,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      }
  
      private boolean unloadChunk0(int x, int z, boolean save) {
@@ -21830,7 +21893,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          if (!this.isChunkLoaded(x, z)) {
              return true;
          }
-@@ -441,7 +442,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -450,7 +451,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean regenerateChunk(int x, int z) {
@@ -21839,7 +21902,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          warnUnsafeChunk("regenerating a faraway chunk", x, z); // Paper
          // Paper start - implement regenerateChunk method
          final ServerLevel serverLevel = this.world;
-@@ -502,6 +503,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -511,6 +512,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean refreshChunk(int x, int z) {
@@ -21847,7 +21910,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          ChunkHolder playerChunk = this.world.getChunkSource().chunkMap.getVisibleChunkIfPresent(ChunkPos.asLong(x, z));
          if (playerChunk == null) return false;
  
-@@ -537,7 +539,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -546,7 +548,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean loadChunk(int x, int z, boolean generate) {
@@ -21856,7 +21919,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          warnUnsafeChunk("loading a faraway chunk", x, z); // Paper
          // Paper start - Optimize this method
          ChunkPos chunkPos = new ChunkPos(x, z);
-@@ -609,7 +611,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -618,7 +620,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          DistanceManager chunkDistanceManager = this.world.getChunkSource().chunkMap.distanceManager;
  
          if (chunkDistanceManager.addRegionTicketAtDistance(TicketType.PLUGIN_TICKET, new ChunkPos(x, z), 2, plugin)) { // keep in-line with force loading, add at level 31
@@ -21865,7 +21928,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
              return true;
          }
  
-@@ -800,13 +802,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -809,13 +811,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean generateTree(Location loc, TreeType type, BlockChangeDelegate delegate) {
@@ -21886,7 +21949,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
                  BlockPos position = ((CraftBlockState) blockstate).getPosition();
                  net.minecraft.world.level.block.state.BlockState oldBlock = this.world.getBlockState(position);
                  int flag = ((CraftBlockState) blockstate).getFlag();
-@@ -814,10 +818,10 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -823,10 +827,10 @@ public class CraftWorld extends CraftRegionAccessor implements World {
                  net.minecraft.world.level.block.state.BlockState newBlock = this.world.getBlockState(position);
                  this.world.notifyAndUpdatePhysics(position, null, oldBlock, newBlock, newBlock, flag, 512);
              }
@@ -21899,7 +21962,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
              return false;
          }
      }
-@@ -851,6 +855,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -860,6 +864,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setTime(long time) {
@@ -21907,7 +21970,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          long margin = (time - this.getFullTime()) % 24000;
          if (margin < 0) margin += 24000;
          this.setFullTime(this.getFullTime() + margin);
-@@ -863,6 +868,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -872,6 +877,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setFullTime(long time) {
@@ -21915,7 +21978,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          // Notify anyone who's listening
          TimeSkipEvent event = new TimeSkipEvent(this, TimeSkipEvent.SkipReason.CUSTOM, time - this.world.getDayTime());
          this.server.getPluginManager().callEvent(event);
-@@ -890,7 +896,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -899,7 +905,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public long getGameTime() {
@@ -21924,7 +21987,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
      }
  
      @Override
-@@ -910,11 +916,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -919,11 +925,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, Entity source) {
@@ -21938,7 +22001,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          return !world.explode(source != null ? ((org.bukkit.craftbukkit.entity.CraftEntity) source).getHandle() : null, loc.getX(), loc.getY(), loc.getZ(), power, setFire, breakBlocks ? net.minecraft.world.level.Level.ExplosionInteraction.MOB : net.minecraft.world.level.Level.ExplosionInteraction.NONE).wasCanceled;
      }
      // Paper end
-@@ -984,6 +992,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -993,6 +1001,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public int getHighestBlockYAt(int x, int z, org.bukkit.HeightMap heightMap) {
@@ -21946,7 +22009,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          warnUnsafeChunk("getting a faraway chunk", x >> 4, z >> 4); // Paper
          // Transient load for this tick
          return this.world.getChunk(x >> 4, z >> 4).getHeight(CraftHeightMap.toNMS(heightMap), x, z);
-@@ -1014,6 +1023,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1023,6 +1032,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      public void setBiome(int x, int y, int z, Holder<net.minecraft.world.level.biome.Biome> bb) {
          BlockPos pos = new BlockPos(x, 0, z);
@@ -21954,7 +22017,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          if (this.world.hasChunkAt(pos)) {
              net.minecraft.world.level.chunk.LevelChunk chunk = this.world.getChunkAt(pos);
  
-@@ -1309,6 +1319,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1323,6 +1333,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setStorm(boolean hasStorm) {
@@ -21962,7 +22025,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.world.serverLevelData.setRaining(hasStorm, org.bukkit.event.weather.WeatherChangeEvent.Cause.PLUGIN); // Paper
          this.setWeatherDuration(0); // Reset weather duration (legacy behaviour)
          this.setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands)
-@@ -1321,6 +1332,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1335,6 +1346,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setWeatherDuration(int duration) {
@@ -21970,7 +22033,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.world.serverLevelData.setRainTime(duration);
      }
  
-@@ -1331,6 +1343,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1345,6 +1357,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setThundering(boolean thundering) {
@@ -21978,7 +22041,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.world.serverLevelData.setThundering(thundering, org.bukkit.event.weather.ThunderChangeEvent.Cause.PLUGIN); // Paper
          this.setThunderDuration(0); // Reset weather duration (legacy behaviour)
          this.setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands)
-@@ -1343,6 +1356,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1357,6 +1370,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setThunderDuration(int duration) {
@@ -21986,7 +22049,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.world.serverLevelData.setThunderTime(duration);
      }
  
-@@ -1353,6 +1367,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1367,6 +1381,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setClearWeatherDuration(int duration) {
@@ -21994,7 +22057,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.world.serverLevelData.setClearWeatherTime(duration);
      }
  
-@@ -1547,6 +1562,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1561,6 +1576,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setKeepSpawnInMemory(boolean keepLoaded) {
@@ -22002,7 +22065,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          // Paper start - Configurable spawn radius
          if (keepLoaded == this.world.keepSpawnInMemory) {
              // do nothing, nothing has changed
-@@ -1625,6 +1641,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1639,6 +1655,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setHardcore(boolean hardcore) {
@@ -22010,7 +22073,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.world.serverLevelData.settings.hardcore = hardcore;
      }
  
-@@ -1637,6 +1654,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1651,6 +1668,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      @Deprecated
      public void setTicksPerAnimalSpawns(int ticksPerAnimalSpawns) {
@@ -22018,7 +22081,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.setTicksPerSpawns(SpawnCategory.ANIMAL, ticksPerAnimalSpawns);
      }
  
-@@ -1649,6 +1667,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1663,6 +1681,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      @Deprecated
      public void setTicksPerMonsterSpawns(int ticksPerMonsterSpawns) {
@@ -22026,7 +22089,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.setTicksPerSpawns(SpawnCategory.MONSTER, ticksPerMonsterSpawns);
      }
  
-@@ -1661,6 +1680,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1675,6 +1694,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      @Deprecated
      public void setTicksPerWaterSpawns(int ticksPerWaterSpawns) {
@@ -22034,7 +22097,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.setTicksPerSpawns(SpawnCategory.WATER_ANIMAL, ticksPerWaterSpawns);
      }
  
-@@ -1673,6 +1693,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1687,6 +1707,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      @Deprecated
      public void setTicksPerWaterAmbientSpawns(int ticksPerWaterAmbientSpawns) {
@@ -22042,7 +22105,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.setTicksPerSpawns(SpawnCategory.WATER_AMBIENT, ticksPerWaterAmbientSpawns);
      }
  
-@@ -1685,6 +1706,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1699,6 +1720,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      @Deprecated
      public void setTicksPerWaterUndergroundCreatureSpawns(int ticksPerWaterUndergroundCreatureSpawns) {
@@ -22050,7 +22113,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.setTicksPerSpawns(SpawnCategory.WATER_UNDERGROUND_CREATURE, ticksPerWaterUndergroundCreatureSpawns);
      }
  
-@@ -1697,11 +1719,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1711,11 +1733,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      @Deprecated
      public void setTicksPerAmbientSpawns(int ticksPerAmbientSpawns) {
@@ -22064,7 +22127,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          Preconditions.checkArgument(spawnCategory != null, "SpawnCategory cannot be null");
          Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory.%s are not supported", spawnCategory);
  
-@@ -1718,21 +1742,25 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1732,21 +1756,25 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
@@ -22090,7 +22153,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.server.getWorldMetadata().removeMetadata(this, metadataKey, owningPlugin);
      }
  
-@@ -1745,6 +1773,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1759,6 +1787,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      @Deprecated
      public void setMonsterSpawnLimit(int limit) {
@@ -22098,7 +22161,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.setSpawnLimit(SpawnCategory.MONSTER, limit);
      }
  
-@@ -1757,6 +1786,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1771,6 +1800,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      @Deprecated
      public void setAnimalSpawnLimit(int limit) {
@@ -22106,7 +22169,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.setSpawnLimit(SpawnCategory.ANIMAL, limit);
      }
  
-@@ -1769,6 +1799,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1783,6 +1813,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      @Deprecated
      public void setWaterAnimalSpawnLimit(int limit) {
@@ -22114,7 +22177,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.setSpawnLimit(SpawnCategory.WATER_ANIMAL, limit);
      }
  
-@@ -1781,6 +1812,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1795,6 +1826,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      @Deprecated
      public void setWaterAmbientSpawnLimit(int limit) {
@@ -22122,7 +22185,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.setSpawnLimit(SpawnCategory.WATER_AMBIENT, limit);
      }
  
-@@ -1793,6 +1825,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1807,6 +1839,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      @Deprecated
      public void setWaterUndergroundCreatureSpawnLimit(int limit) {
@@ -22130,7 +22193,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.setSpawnLimit(SpawnCategory.WATER_UNDERGROUND_CREATURE, limit);
      }
  
-@@ -1805,6 +1838,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1819,6 +1852,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      @Deprecated
      public void setAmbientSpawnLimit(int limit) {
@@ -22138,7 +22201,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          this.setSpawnLimit(SpawnCategory.AMBIENT, limit);
      }
  
-@@ -1827,6 +1861,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1841,6 +1875,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setSpawnLimit(SpawnCategory spawnCategory, int limit) {
@@ -22146,25 +22209,25 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          Preconditions.checkArgument(spawnCategory != null, "SpawnCategory cannot be null");
          Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory.%s are not supported", spawnCategory);
  
-@@ -1881,7 +1916,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1920,7 +1955,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          if (!(entity instanceof CraftEntity craftEntity) || entity.getWorld() != this || sound == null || category == null) return;
  
-         ClientboundSoundEntityPacket packet = new ClientboundSoundEntityPacket(CraftSound.bukkitToMinecraftHolder(sound), net.minecraft.sounds.SoundSource.valueOf(category.name()), craftEntity.getHandle(), volume, pitch, this.getHandle().getRandom().nextLong());
+         ClientboundSoundEntityPacket packet = new ClientboundSoundEntityPacket(CraftSound.bukkitToMinecraftHolder(sound), net.minecraft.sounds.SoundSource.valueOf(category.name()), craftEntity.getHandle(), volume, pitch, seed);
 -        ChunkMap.TrackedEntity entityTracker = this.getHandle().getChunkSource().chunkMap.entityMap.get(entity.getEntityId());
 +        ChunkMap.TrackedEntity entityTracker = ((CraftEntity) entity).getHandle().tracker; // Folia - region threading
          if (entityTracker != null) {
              entityTracker.broadcastAndSend(packet);
          }
-@@ -1892,7 +1927,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1931,7 +1966,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          if (!(entity instanceof CraftEntity craftEntity) || entity.getWorld() != this || sound == null || category == null) return;
  
-         ClientboundSoundEntityPacket packet = new ClientboundSoundEntityPacket(Holder.direct(SoundEvent.createVariableRangeEvent(new ResourceLocation(sound))), net.minecraft.sounds.SoundSource.valueOf(category.name()), craftEntity.getHandle(), volume, pitch, this.getHandle().getRandom().nextLong());
+         ClientboundSoundEntityPacket packet = new ClientboundSoundEntityPacket(Holder.direct(SoundEvent.createVariableRangeEvent(new ResourceLocation(sound))), net.minecraft.sounds.SoundSource.valueOf(category.name()), craftEntity.getHandle(), volume, pitch, seed);
 -        ChunkMap.TrackedEntity entityTracker = this.getHandle().getChunkSource().chunkMap.entityMap.get(entity.getEntityId());
 +        ChunkMap.TrackedEntity entityTracker = ((CraftEntity)entity).getHandle().tracker; // Folia - region threading
          if (entityTracker != null) {
              entityTracker.broadcastAndSend(packet);
          }
-@@ -1978,6 +2013,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2017,6 +2052,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean setGameRuleValue(String rule, String value) {
@@ -22172,7 +22235,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          // No null values allowed
          if (rule == null || value == null) return false;
  
-@@ -2020,6 +2056,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2059,6 +2095,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public <T> boolean setGameRule(GameRule<T> rule, T newValue) {
@@ -22180,7 +22243,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          Preconditions.checkArgument(rule != null, "GameRule cannot be null");
          Preconditions.checkArgument(newValue != null, "GameRule value cannot be null");
  
-@@ -2272,6 +2309,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2311,6 +2348,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void sendGameEvent(Entity sourceEntity, org.bukkit.GameEvent gameEvent, Vector position) {
@@ -22193,7 +22256,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
          getHandle().gameEvent(sourceEntity != null ? ((CraftEntity) sourceEntity).getHandle(): null, net.minecraft.core.registries.BuiltInRegistries.GAME_EVENT.get(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(gameEvent.getKey())), org.bukkit.craftbukkit.util.CraftVector.toBlockPos(position));
      }
      // Paper end
-@@ -2426,7 +2469,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2465,7 +2508,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      // Paper start
      public java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent) {
          warnUnsafeChunk("getting a faraway chunk async", x, z); // Paper
@@ -22202,7 +22265,7 @@ index c3060d1d4d0caf369c6ab516cb424f45eb851019..bcbf7ba7c687ecaa530d4de3af45ebeb
              net.minecraft.world.level.chunk.LevelChunk immediate = this.world.getChunkSource().getChunkAtIfLoadedImmediately(x, z);
              if (immediate != null) {
                  return java.util.concurrent.CompletableFuture.completedFuture(new CraftChunk(immediate));
-@@ -2443,7 +2486,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2482,7 +2525,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          java.util.concurrent.CompletableFuture<Chunk> ret = new java.util.concurrent.CompletableFuture<>();
  
          io.papermc.paper.chunk.system.ChunkSystem.scheduleChunkLoad(this.getHandle(), x, z, gen, ChunkStatus.FULL, true, priority, (c) -> {
@@ -22224,10 +22287,10 @@ index a8760f015b9ee3ee408c3b9220266eb76b313ba0..fadf10c6a7fabde2c13f3aff00739a21
                      tileentitybeehive.addOccupantWithPresetTicks(entitybee, false, random.nextInt(599));
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index bec8e6b62dba2bd0e4e85a7d1fb51287384f1290..6c91ee8b61cca34bd9e251076d8e9881729526da 100644
+index e5506a7d074a9f89d41f4d5d7549a458779bef20..1849c13df615dc736c22cbb58d92ddaac51db2e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -74,6 +74,11 @@ public class CraftBlock implements Block {
+@@ -75,6 +75,11 @@ public class CraftBlock implements Block {
      }
  
      public net.minecraft.world.level.block.state.BlockState getNMS() {
@@ -22239,7 +22302,7 @@ index bec8e6b62dba2bd0e4e85a7d1fb51287384f1290..6c91ee8b61cca34bd9e251076d8e9881
          return this.world.getBlockState(this.position);
      }
  
-@@ -150,6 +155,11 @@ public class CraftBlock implements Block {
+@@ -151,6 +156,11 @@ public class CraftBlock implements Block {
      }
  
      private void setData(final byte data, int flag) {
@@ -22251,7 +22314,7 @@ index bec8e6b62dba2bd0e4e85a7d1fb51287384f1290..6c91ee8b61cca34bd9e251076d8e9881
          this.world.setBlock(this.position, CraftMagicNumbers.getBlock(this.getType(), data), flag);
      }
  
-@@ -191,6 +201,11 @@ public class CraftBlock implements Block {
+@@ -192,6 +202,11 @@ public class CraftBlock implements Block {
      }
  
      public static boolean setTypeAndData(LevelAccessor world, BlockPos position, net.minecraft.world.level.block.state.BlockState old, net.minecraft.world.level.block.state.BlockState blockData, boolean applyPhysics) {
@@ -22263,7 +22326,7 @@ index bec8e6b62dba2bd0e4e85a7d1fb51287384f1290..6c91ee8b61cca34bd9e251076d8e9881
          // SPIGOT-611: need to do this to prevent glitchiness. Easier to handle this here (like /setblock) than to fix weirdness in tile entity cleanup
          if (old.hasBlockEntity() && blockData.getBlock() != old.getBlock()) { // SPIGOT-3725 remove old tile entity if block changes
              // SPIGOT-4612: faster - just clear tile
-@@ -336,18 +351,33 @@ public class CraftBlock implements Block {
+@@ -337,18 +352,33 @@ public class CraftBlock implements Block {
  
      @Override
      public Biome getBiome() {
@@ -22297,7 +22360,7 @@ index bec8e6b62dba2bd0e4e85a7d1fb51287384f1290..6c91ee8b61cca34bd9e251076d8e9881
          this.getWorld().setBiome(this.getX(), this.getY(), this.getZ(), bio);
      }
  
-@@ -395,6 +425,11 @@ public class CraftBlock implements Block {
+@@ -396,6 +426,11 @@ public class CraftBlock implements Block {
  
      @Override
      public boolean isBlockFaceIndirectlyPowered(BlockFace face) {
@@ -22309,7 +22372,7 @@ index bec8e6b62dba2bd0e4e85a7d1fb51287384f1290..6c91ee8b61cca34bd9e251076d8e9881
          int power = this.world.getMinecraftWorld().getSignal(this.position, CraftBlock.blockFaceToNotch(face));
  
          Block relative = this.getRelative(face);
-@@ -407,6 +442,11 @@ public class CraftBlock implements Block {
+@@ -408,6 +443,11 @@ public class CraftBlock implements Block {
  
      @Override
      public int getBlockPower(BlockFace face) {
@@ -22321,7 +22384,7 @@ index bec8e6b62dba2bd0e4e85a7d1fb51287384f1290..6c91ee8b61cca34bd9e251076d8e9881
          int power = 0;
          net.minecraft.world.level.Level world = this.world.getMinecraftWorld();
          int x = this.getX();
-@@ -493,6 +533,11 @@ public class CraftBlock implements Block {
+@@ -494,6 +534,11 @@ public class CraftBlock implements Block {
  
      @Override
      public boolean breakNaturally(ItemStack item, boolean triggerEffect, boolean dropExperience) {
@@ -22333,7 +22396,7 @@ index bec8e6b62dba2bd0e4e85a7d1fb51287384f1290..6c91ee8b61cca34bd9e251076d8e9881
          // Paper end
          // Order matters here, need to drop before setting to air so skulls can get their data
          net.minecraft.world.level.block.state.BlockState iblockdata = this.getNMS();
-@@ -536,21 +581,27 @@ public class CraftBlock implements Block {
+@@ -537,21 +582,27 @@ public class CraftBlock implements Block {
  
      @Override
      public boolean applyBoneMeal(BlockFace face) {
@@ -22368,7 +22431,7 @@ index bec8e6b62dba2bd0e4e85a7d1fb51287384f1290..6c91ee8b61cca34bd9e251076d8e9881
              StructureGrowEvent structureEvent = null;
  
              if (treeType != null) {
-@@ -637,6 +688,11 @@ public class CraftBlock implements Block {
+@@ -638,6 +689,11 @@ public class CraftBlock implements Block {
  
      @Override
      public RayTraceResult rayTrace(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode) {
@@ -22380,7 +22443,7 @@ index bec8e6b62dba2bd0e4e85a7d1fb51287384f1290..6c91ee8b61cca34bd9e251076d8e9881
          Preconditions.checkArgument(start != null, "Location start cannot be null");
          Preconditions.checkArgument(this.getWorld().equals(start.getWorld()), "Location start cannot be a different world");
          start.checkFinite();
-@@ -678,6 +734,11 @@ public class CraftBlock implements Block {
+@@ -679,6 +735,11 @@ public class CraftBlock implements Block {
  
      @Override
      public boolean canPlace(BlockData data) {
@@ -22392,7 +22455,7 @@ index bec8e6b62dba2bd0e4e85a7d1fb51287384f1290..6c91ee8b61cca34bd9e251076d8e9881
          Preconditions.checkArgument(data != null, "BlockData cannot be null");
          net.minecraft.world.level.block.state.BlockState iblockdata = ((CraftBlockData) data).getState();
          net.minecraft.world.level.Level world = this.world.getMinecraftWorld();
-@@ -712,6 +773,11 @@ public class CraftBlock implements Block {
+@@ -713,6 +774,11 @@ public class CraftBlock implements Block {
  
      @Override
      public void tick() {
@@ -22404,7 +22467,7 @@ index bec8e6b62dba2bd0e4e85a7d1fb51287384f1290..6c91ee8b61cca34bd9e251076d8e9881
          net.minecraft.world.level.block.state.BlockState blockData = this.getNMS();
          net.minecraft.server.level.ServerLevel level = this.world.getMinecraftWorld();
  
-@@ -720,6 +786,11 @@ public class CraftBlock implements Block {
+@@ -721,6 +787,11 @@ public class CraftBlock implements Block {
  
      @Override
      public void randomTick() {
@@ -22466,10 +22529,10 @@ index 12eeabafbad9da8796dc6fc383b732cf75bb7ddb..6ede423639c8e2012da897f517e8f7c9
              List<String> offers = waitable.get();
              if (offers == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0e6c7284b9aee6c5f2454a3a095ebf349f887740..690e57b55adb53d56d874cbddec6226a515f43a2 100644
+index aa4dbf91cf6da329fdcacbde98bb870eb48e8f5c..cd29fa29fa65060c21c715bd756c5a35429eeb96 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -581,6 +581,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -588,6 +588,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
  
      @Override
      public boolean teleport(Location location, TeleportCause cause, io.papermc.paper.entity.TeleportFlag... flags) {
@@ -22481,7 +22544,7 @@ index 0e6c7284b9aee6c5f2454a3a095ebf349f887740..690e57b55adb53d56d874cbddec6226a
          // Paper end
          Preconditions.checkArgument(location != null, "location cannot be null");
          location.checkFinite();
-@@ -1035,7 +1040,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1054,7 +1059,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          ImmutableSet.Builder<Player> players = ImmutableSet.builder();
  
          ServerLevel world = ((CraftWorld) this.getWorld()).getHandle();
@@ -22490,7 +22553,7 @@ index 0e6c7284b9aee6c5f2454a3a095ebf349f887740..690e57b55adb53d56d874cbddec6226a
  
          if (entityTracker != null) {
              for (ServerPlayerConnection connection : entityTracker.seenBy) {
-@@ -1293,7 +1298,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1348,7 +1353,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          }
  
          ServerLevel world = ((CraftWorld) this.getWorld()).getHandle();
@@ -22499,7 +22562,7 @@ index 0e6c7284b9aee6c5f2454a3a095ebf349f887740..690e57b55adb53d56d874cbddec6226a
  
          if (entityTracker == null) {
              return;
-@@ -1361,30 +1366,43 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1416,30 +1421,43 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          Preconditions.checkArgument(location != null, "location");
          location.checkFinite();
          Location locationClone = location.clone(); // clone so we don't need to worry about mutations after this call.
@@ -22564,10 +22627,10 @@ index 0e6c7284b9aee6c5f2454a3a095ebf349f887740..690e57b55adb53d56d874cbddec6226a
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 83aaf3e6e377d731ce02f779f80b7bf5db46f89f..249887106315ed0625b08bc8b2a74404cf0a418b 100644
+index fd84786f3e72875e79df46416f47f3403876cef3..374a845acc6b12eb82af4282d52e22f1291f77f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -591,7 +591,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -599,7 +599,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void kickPlayer(String message) {
@@ -22576,7 +22639,7 @@ index 83aaf3e6e377d731ce02f779f80b7bf5db46f89f..249887106315ed0625b08bc8b2a74404
          if (this.getHandle().connection == null) return;
  
          this.getHandle().connection.disconnect(message == null ? "" : message, org.bukkit.event.player.PlayerKickEvent.Cause.PLUGIN); // Paper - kick event cause
-@@ -1298,6 +1298,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1322,6 +1322,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean teleport(Location location, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause cause, io.papermc.paper.entity.TeleportFlag... flags) {
@@ -22588,7 +22651,7 @@ index 83aaf3e6e377d731ce02f779f80b7bf5db46f89f..249887106315ed0625b08bc8b2a74404
          java.util.Set<net.minecraft.world.entity.RelativeMovement> relativeArguments;
          java.util.Set<io.papermc.paper.entity.TeleportFlag> allFlags;
          if (flags.length == 0) {
-@@ -1880,7 +1885,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1904,7 +1909,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private void unregisterEntity(Entity other) {
          // Paper end
          ChunkMap tracker = ((ServerLevel) this.getHandle().level()).getChunkSource().chunkMap;
@@ -22597,7 +22660,7 @@ index 83aaf3e6e377d731ce02f779f80b7bf5db46f89f..249887106315ed0625b08bc8b2a74404
          if (entry != null) {
              entry.removePlayer(this.getHandle());
          }
-@@ -1977,7 +1982,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2001,7 +2006,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              if (original != null) otherPlayer.setUUID(original); // Paper - uuid override
          }
  
@@ -22607,7 +22670,7 @@ index 83aaf3e6e377d731ce02f779f80b7bf5db46f89f..249887106315ed0625b08bc8b2a74404
              entry.updatePlayer(this.getHandle());
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5dc160b743534665c6b3efb10b10f7c36e2da5ab..606551330859fd423b31d246bc14891d1236ba42 100644
+index f5a5ae30dfba21d5cf3990c046cfe41547e8a87a..43ed483add05ddeafdc5a3595a212aaeab128b26 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -246,8 +246,8 @@ import org.bukkit.potion.PotionEffect;
@@ -22639,7 +22702,7 @@ index 5dc160b743534665c6b3efb10b10f7c36e2da5ab..606551330859fd423b31d246bc14891d
          Bukkit.getPluginManager().callEvent(event);
  
          if (!event.isCancelled()) {
-@@ -1047,8 +1047,8 @@ public class CraftEventFactory {
+@@ -1059,8 +1059,8 @@ public class CraftEventFactory {
      private static EntityDamageEvent handleEntityDamageEvent(Entity entity, DamageSource source, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled) {
          if (source.is(DamageTypeTags.IS_EXPLOSION)) {
              DamageCause damageCause;
@@ -22650,7 +22713,7 @@ index 5dc160b743534665c6b3efb10b10f7c36e2da5ab..606551330859fd423b31d246bc14891d
              EntityDamageEvent event;
              if (damager == null) {
                  event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.BLOCK_EXPLOSION, modifiers, modifierFunctions, source.explodedBlockState); // Paper - handle block state in damage
-@@ -1109,13 +1109,13 @@ public class CraftEventFactory {
+@@ -1121,13 +1121,13 @@ public class CraftEventFactory {
              }
              return event;
          } else if (source.is(DamageTypes.LAVA)) {
@@ -22668,7 +22731,7 @@ index 5dc160b743534665c6b3efb10b10f7c36e2da5ab..606551330859fd423b31d246bc14891d
  
              if (!event.isCancelled()) {
                  event.getEntity().setLastDamageCause(event);
-@@ -1123,9 +1123,9 @@ public class CraftEventFactory {
+@@ -1135,9 +1135,9 @@ public class CraftEventFactory {
                  entity.lastDamageCancelled = true; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
              }
              return event;
@@ -22680,7 +22743,7 @@ index 5dc160b743534665c6b3efb10b10f7c36e2da5ab..606551330859fd423b31d246bc14891d
              if (source.is(DamageTypes.CACTUS) || source.is(DamageTypes.SWEET_BERRY_BUSH) || source.is(DamageTypes.STALAGMITE) || source.is(DamageTypes.FALLING_STALACTITE) || source.is(DamageTypes.FALLING_ANVIL)) {
                  cause = DamageCause.CONTACT;
              } else if (source.is(DamageTypes.HOT_FLOOR)) {
-@@ -1140,9 +1140,9 @@ public class CraftEventFactory {
+@@ -1152,9 +1152,9 @@ public class CraftEventFactory {
              EntityDamageEvent event = new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions);
              event.setCancelled(cancelled);
  
@@ -22692,7 +22755,7 @@ index 5dc160b743534665c6b3efb10b10f7c36e2da5ab..606551330859fd423b31d246bc14891d
  
              if (!event.isCancelled()) {
                  event.getEntity().setLastDamageCause(event);
-@@ -1150,10 +1150,10 @@ public class CraftEventFactory {
+@@ -1162,10 +1162,10 @@ public class CraftEventFactory {
                  entity.lastDamageCancelled = true; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
              }
              return event;
@@ -22706,7 +22769,7 @@ index 5dc160b743534665c6b3efb10b10f7c36e2da5ab..606551330859fd423b31d246bc14891d
              if (source.is(DamageTypes.FALLING_STALACTITE) || source.is(DamageTypes.FALLING_BLOCK) || source.is(DamageTypes.FALLING_ANVIL)) {
                  cause = DamageCause.FALLING_BLOCK;
              } else if (damager instanceof LightningStrike) {
-@@ -2123,7 +2123,7 @@ public class CraftEventFactory {
+@@ -2134,7 +2134,7 @@ public class CraftEventFactory {
          CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemStack.copyWithCount(1));
  
          org.bukkit.event.block.BlockDispenseEvent event = new org.bukkit.event.block.BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(to.getX(), to.getY(), to.getZ()));
@@ -22716,7 +22779,7 @@ index 5dc160b743534665c6b3efb10b10f7c36e2da5ab..606551330859fd423b31d246bc14891d
                  return itemStack;
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 3ceb5d83be20183da907915f70ba9e64369373a9..b23e43f7ac22bc106a0bcde4a8bca9ecba1a9ae4 100644
+index 700932b65e4fda560d684b0aa079bcee3923f73e..2c3e1b420303a3c3a9315983fbc7e47423f7d9e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -530,6 +530,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -22728,10 +22791,10 @@ index 3ceb5d83be20183da907915f70ba9e64369373a9..b23e43f7ac22bc106a0bcde4a8bca9ec
          if (!this.isAsyncScheduler && !task.isSync()) {
              this.asyncScheduler.handle(task, delay);
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 548c77592a3520e8053483644eba805079a14f1a..73c395cd5fd3dc07640cdc06e174cd99de43df4c 100644
+index ec2396f0e5d62b10450eaa7239a8c5479638b3c3..baf5605f31d3c24441da7e2fe13c923ba6ae1199 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -380,6 +380,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -377,6 +377,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
          String minimumVersion = MinecraftServer.getServer().server.minimumAPI;
          int minimumIndex = CraftMagicNumbers.SUPPORTED_API.indexOf(minimumVersion);
  
@@ -22745,7 +22808,7 @@ index 548c77592a3520e8053483644eba805079a14f1a..73c395cd5fd3dc07640cdc06e174cd99
              int pluginIndex = CraftMagicNumbers.SUPPORTED_API.indexOf(pdf.getAPIVersion());
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/DelegatedGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DelegatedGeneratorAccess.java
-index cbedb6f002bc01daa16d349421c4ef04d4bcbcb2..2d708bb11f841bb265d12a025dbaa657b0b4d08a 100644
+index a650411e3fa7e2a045ac55502c77028be348acf1..b5760a68ee09494fa5c522f5785c23f8c46cd687 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/DelegatedGeneratorAccess.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/DelegatedGeneratorAccess.java
 @@ -69,6 +69,13 @@ public abstract class DelegatedGeneratorAccess implements WorldGenLevel {
@@ -22948,10 +23011,10 @@ index 68602dfb171d47e47fd0710b4324013ef05214d0..2d75cefc69ea1da96a99370aef3df7bd
  
      public static int playerSample;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index f9b8e2bc039f1a37e47f84909c8785f3ef530284..315b860807bed537f8dbd85c9a053e39216e7b71 100644
+index 1cf6d4f854d89c515e48e1fb365eb95ff9340765..efe5b848a8e3645cae10c435196c8189b7422f45 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -433,7 +433,7 @@ public class SpigotWorldConfig
+@@ -435,7 +435,7 @@ public class SpigotWorldConfig
          this.otherMultiplier = (float) this.getDouble( "hunger.other-multiplier", 0.0 );
      }
  
diff --git a/patches/server/0004-Max-pending-logins.patch b/patches/server/0004-Max-pending-logins.patch
index 1339701..63f3146 100644
--- a/patches/server/0004-Max-pending-logins.patch
+++ b/patches/server/0004-Max-pending-logins.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Max pending logins
 Should help the floodgates on launch
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 6f483c6581daeaf68f85e3b730d31c5b7a6ae001..f7c2d6d82ee1b5975cd114934b7beaec3d5d490d 100644
+index d0f7434164f6241ec81c990c7a127f504e019291..8586df59afd0af51721a0950c7bf4582092417fc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -88,7 +88,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -89,7 +89,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
              if (this.server.getPlayerList().pushPendingJoin(name, uniqueId, this.connection)) {
              // Folia end - region threading - rewrite login process
              this.verifyLoginAndFinishConnectionSetup((GameProfile) Objects.requireNonNull(this.authenticatedProfile));
@@ -19,10 +19,10 @@ index 6f483c6581daeaf68f85e3b730d31c5b7a6ae001..f7c2d6d82ee1b5975cd114934b7beaec
  
          if (this.state == ServerLoginPacketListenerImpl.State.WAITING_FOR_DUPE_DISCONNECT && !this.isPlayerAlreadyInWorld((GameProfile) Objects.requireNonNull(this.authenticatedProfile))) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6cce2a9bc9beeeef25b7bacd2ad307ed3ae44432..41ba8950b3aada5eea55a0db841c6b9291262bf2 100644
+index 0fa69640a699e1c33cb307366b0335ac9bac4282..bc31d4dfd6fca354c093f552901a59e5b83c92d7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -173,6 +173,17 @@ public abstract class PlayerList {
+@@ -171,6 +171,17 @@ public abstract class PlayerList {
              conflictingId = this.connectionById.get(byId);
  
              if (conflictingName == null && conflictingId == null) {
diff --git a/patches/server/0006-Make-CraftEntity-getHandle-and-overrides-perform-thr.patch b/patches/server/0006-Make-CraftEntity-getHandle-and-overrides-perform-thr.patch
index 00ca31c..044ac10 100644
--- a/patches/server/0006-Make-CraftEntity-getHandle-and-overrides-perform-thr.patch
+++ b/patches/server/0006-Make-CraftEntity-getHandle-and-overrides-perform-thr.patch
@@ -29,10 +29,10 @@ index 41bf71d116ffc5431586ce54abba7f8def6c1dcf..519da6886613b8460e989767b1a21e31
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index dd18591d7928ab04f6f7c09aa89a26ccbe20c323..385d5bc08928dd990b690b926e174af86f178c64 100644
+index 9f38cec134dfd476d0a8d56b628238d2d27baf83..65ae803da6fa395c9ad031460fc76077da62aeec 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2863,6 +2863,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2918,6 +2918,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              if (!force && (!this.canRide(entity) || !entity.canAddPassenger(this))) {
                  return false;
              } else {
@@ -40,7 +40,7 @@ index dd18591d7928ab04f6f7c09aa89a26ccbe20c323..385d5bc08928dd990b690b926e174af8
                  // CraftBukkit start
                  if (entity.getBukkitEntity() instanceof Vehicle && this.getBukkitEntity() instanceof LivingEntity) {
                      VehicleEnterEvent event = new VehicleEnterEvent((Vehicle) entity.getBukkitEntity(), this.getBukkitEntity());
-@@ -2884,6 +2885,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2939,6 +2940,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  if (event.isCancelled()) {
                      return false;
                  }
@@ -48,7 +48,7 @@ index dd18591d7928ab04f6f7c09aa89a26ccbe20c323..385d5bc08928dd990b690b926e174af8
                  // Spigot end
                  if (this.isPassenger()) {
                      this.stopRiding();
-@@ -2962,6 +2964,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3017,6 +3019,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
          } else {
              // CraftBukkit start
@@ -56,7 +56,7 @@ index dd18591d7928ab04f6f7c09aa89a26ccbe20c323..385d5bc08928dd990b690b926e174af8
              CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle();
              Entity orig = craft == null ? null : craft.getHandle();
              if (this.getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
-@@ -2989,6 +2992,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3044,6 +3047,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              if (event.isCancelled()) {
                  return false;
              }
@@ -456,10 +456,10 @@ index 80e571c977db5cdf43bfbfce035f37a3fa325c95..6fafba37dd7128a397ba046be7b33067
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java
-index 6c9531c018be29b5794d047b50007fde1b50b494..cb2f710a48c1e42cf800f657befaac4e2b8a82ff 100644
+index 0ccc20157fb9fdb9c99b942dcb4675db5f928b23..aa9881552e0ba78d844de105184953c487ad426b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java
-@@ -15,8 +15,16 @@ public class CraftCat extends CraftTameableAnimal implements Cat {
+@@ -16,8 +16,16 @@ public class CraftCat extends CraftTameableAnimal implements Cat {
          super(server, entity);
      }
  
@@ -897,10 +897,10 @@ index d657fd2c507a5b215aeab0a5f3e9c2ee892a27c8..9fc90b162aab15a9cd60b02aba563181
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 690e57b55adb53d56d874cbddec6226a515f43a2..9f070a9f0894d88688ff50efc3f4dba8188c3885 100644
+index cd29fa29fa65060c21c715bd756c5a35429eeb96..c46d00843f4a1a1c482f18856a846c09eff30293 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -826,7 +826,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -845,7 +845,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
  
      @Override
      public UUID getUniqueId() {
@@ -909,7 +909,7 @@ index 690e57b55adb53d56d874cbddec6226a515f43a2..9f070a9f0894d88688ff50efc3f4dba8
      }
  
      @Override
-@@ -841,6 +841,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -860,6 +860,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      }
  
      public Entity getHandle() {
@@ -1359,10 +1359,10 @@ index 8746f80d08df5501b32958eb123aa7d814573ddf..c6c6eb55f4649e18beef9832c2ea7b9d
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index aefb9879b2edadfb4b21d80135d713b9d34c9941..320b69a62a01d54d116115cc6b571ad63558befd 100644
+index 8a1e765363aeb61078fd23980d3856dc680cb05e..98f2be104eb2882f8c841a637ba821d96e0bf6bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -291,8 +291,16 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -292,8 +292,16 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          this.mode = mode;
      }
  
@@ -1464,7 +1464,7 @@ index 63cae1a2e95d8da17c45c4404a8dd0ca6a413c39..f57139f03da9519802ee156f37691d08
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index f444e843535ec68ede0f05e7e7ef182ce872342b..c8fdfb3ee9ad5ca1853ac2ec3a7ff04ce8081dbb 100644
+index 81498941748d646ebe6495f4a7ce6953532144c6..23ff09abb5f99b0cee2375769004c4f709257e39 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -18,8 +18,16 @@ public class CraftItem extends CraftEntity implements Item {
@@ -1590,10 +1590,10 @@ index 70b377c03346cb8573827aeb493f3b6eb8efb1f8..b2e8c26162dd5782a0447cd03ca00fb4
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 1992bd985d1beae77b88d71c5fa551a277943fdb..abc18d0e52d1e6ab4d04a9d8b97f91c9d6c4c02e 100644
+index ba2cd9c4cdbd5ddab1300320d7e0ede4d4b7a31a..66edfd724275c06b58d0a4a5fb5e484257850e36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -417,6 +417,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -418,6 +418,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          this.getHandle().invulnerableTime = ticks;
      }
  
@@ -1607,7 +1607,7 @@ index 1992bd985d1beae77b88d71c5fa551a277943fdb..abc18d0e52d1e6ab4d04a9d8b97f91c9
      @Override
      public int getNoActionTicks() {
          return this.getHandle().getNoActionTime();
-@@ -430,6 +437,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -431,6 +438,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
  
      @Override
      public net.minecraft.world.entity.LivingEntity getHandle() {
@@ -1878,7 +1878,7 @@ index 706c74c832f6893df3797023f68add31139c7d57..80a612f16669e571e336dd6369a968b4
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
-index 7ee489da5963fd722fc2531fef14911447a16557..f07b07805ce0b168e945c81ae82b690db0ba79e5 100644
+index e5df527d3f0b82327bcd4cb66c12baa439b4cec6..3ca3c62485e5701c76e4fbfac853ed128194e0ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
 @@ -10,8 +10,16 @@ public class CraftMushroomCow extends CraftCow implements MushroomCow, io.paperm
@@ -2130,10 +2130,10 @@ index 2638c341bc02f201f7ab17fdebcdbdf3a7ec05bf..0f5c2d31a2dea13a46ba81e353393633
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 249887106315ed0625b08bc8b2a74404cf0a418b..6c8f6e26687b557fcdcd65c657d8b35d3fde805e 100644
+index 374a845acc6b12eb82af4282d52e22f1291f77f7..7a8762a35cb47f86c64be00c220a997c8f9f5108 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -611,7 +611,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -619,7 +619,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void kick(net.kyori.adventure.text.Component message, org.bukkit.event.player.PlayerKickEvent.Cause cause) {
@@ -2142,7 +2142,7 @@ index 249887106315ed0625b08bc8b2a74404cf0a418b..6c8f6e26687b557fcdcd65c657d8b35d
          final ServerGamePacketListenerImpl connection = this.getHandle().connection;
          if (connection != null) {
              connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message, cause);
-@@ -2138,9 +2138,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2162,9 +2162,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this;
      }
  
@@ -2160,7 +2160,7 @@ index 249887106315ed0625b08bc8b2a74404cf0a418b..6c8f6e26687b557fcdcd65c657d8b35d
      }
  
      public void setHandle(final ServerPlayer entity) {
-@@ -3156,7 +3163,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3162,7 +3169,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          {
              if ( CraftPlayer.this.getHealth() <= 0 && CraftPlayer.this.isOnline() )
              {
@@ -2865,7 +2865,7 @@ index 4b3a764114c8372e1549dadeeced26dc7727f2d1..04cbe165b99d348a864da5d342225fc9
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
-index c8b65210d2416b5a293cb4bcc1b71f56ed365cd7..0e3045647382111066000fc03925596c1d757e6b 100644
+index 8a6af0db8e0aa0cffbf19584be747076c2c8ee44..b7c639a027001a064333fb4e8feb0e049e8cabbd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
 @@ -12,8 +12,16 @@ public class CraftTrident extends CraftArrow implements Trident {
diff --git a/patches/server/0007-Disable-mid-tick-task-execution.patch b/patches/server/0007-Disable-mid-tick-task-execution.patch
index 13acb65..e803629 100644
--- a/patches/server/0007-Disable-mid-tick-task-execution.patch
+++ b/patches/server/0007-Disable-mid-tick-task-execution.patch
@@ -10,11 +10,11 @@ the impact from scaling the region threads, but is not a fix
 to the underlying issue.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 75d5e7f1b247e27f526a3f76fa7df7aeca4e90ac..5ded3dbc379f199ed735b6ce0ebf6a2e3485f93b 100644
+index 99a086ed2c0d5615a55539a31b8cd8483569e9c0..844424e7488eb42753f50e0e998aebf93c912877 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2877,6 +2877,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     }
+@@ -1469,6 +1469,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     // Folia end - region threading
  
      public final void executeMidTickTasks() {
 +        if (true) return; // Folia - disable mid-tick task execution
diff --git a/patches/server/0008-Throw-UnsupportedOperationException-for-broken-APIs.patch b/patches/server/0008-Throw-UnsupportedOperationException-for-broken-APIs.patch
index 3da2146..f9df777 100644
--- a/patches/server/0008-Throw-UnsupportedOperationException-for-broken-APIs.patch
+++ b/patches/server/0008-Throw-UnsupportedOperationException-for-broken-APIs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Throw UnsupportedOperationException() for broken APIs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 541915675dd3ad832992360283e3ba1b3cc62e27..bc778637c7d4371cafa9bcda67f8965f57cc66d6 100644
+index d2c8ad04c59035449dc798a637acc6e809d35fc4..7cbf625384f02e3c8c40a57cd5582ecaca4bd15c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1268,6 +1268,7 @@ public final class CraftServer implements Server {
+@@ -1263,6 +1263,7 @@ public final class CraftServer implements Server {
  
      @Override
      public World createWorld(WorldCreator creator) {
@@ -16,7 +16,7 @@ index 541915675dd3ad832992360283e3ba1b3cc62e27..bc778637c7d4371cafa9bcda67f8965f
          Preconditions.checkState(this.console.getAllLevels().iterator().hasNext(), "Cannot create additional worlds on STARTUP");
          //Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot create a world while worlds are being ticked"); // Paper - Cat - Temp disable. We'll see how this goes.
          Preconditions.checkArgument(creator != null, "WorldCreator cannot be null");
-@@ -1410,6 +1411,7 @@ public final class CraftServer implements Server {
+@@ -1442,6 +1443,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean unloadWorld(World world, boolean save) {
@@ -25,10 +25,10 @@ index 541915675dd3ad832992360283e3ba1b3cc62e27..bc778637c7d4371cafa9bcda67f8965f
          if (world == null) {
              return false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
-index a8c5bfc54ed2b8bd873f124c7080d73fe73a86ad..f59e9e6dd21a7d034b5e3b6e7787458d3c3c7bbc 100644
+index 81889e30a634ac84d996f688d0a2466e9efa19ca..f2ad3247b512ed5115dea475035736eddc038c7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
-@@ -43,6 +43,7 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
+@@ -45,6 +45,7 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
      }
      @Override
      public CraftObjective registerNewObjective(String name, Criteria criteria, net.kyori.adventure.text.Component displayName, RenderType renderType) throws IllegalArgumentException {
@@ -36,7 +36,7 @@ index a8c5bfc54ed2b8bd873f124c7080d73fe73a86ad..f59e9e6dd21a7d034b5e3b6e7787458d
          if (displayName == null) {
              displayName = net.kyori.adventure.text.Component.empty();
          }
-@@ -198,6 +199,7 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
+@@ -204,6 +205,7 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
  
      @Override
      public Team registerNewTeam(String name) {
@@ -44,7 +44,7 @@ index a8c5bfc54ed2b8bd873f124c7080d73fe73a86ad..f59e9e6dd21a7d034b5e3b6e7787458d
          Preconditions.checkArgument(name != null, "Team name cannot be null");
          Preconditions.checkArgument(name.length() <= Short.MAX_VALUE, "Team name '%s' is longer than the limit of 32767 characters (%s)", name, name.length());
          Preconditions.checkArgument(this.board.getPlayerTeam(name) == null, "Team name '%s' is already in use", name);
-@@ -225,6 +227,7 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
+@@ -231,6 +233,7 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
  
      @Override
      public void clearSlot(DisplaySlot slot) {
@@ -53,7 +53,7 @@ index a8c5bfc54ed2b8bd873f124c7080d73fe73a86ad..f59e9e6dd21a7d034b5e3b6e7787458d
          this.board.setDisplayObjective(CraftScoreboardTranslations.fromBukkitSlot(slot), null);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
-index 891f850ea99dac1433f3e395e26be14c8abf2bfb..345ee10b109b9b3d7343d915f6bd6b95704cdf60 100644
+index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..46a8262f21ef95714c122240ee86f01858010047 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
 @@ -42,6 +42,7 @@ public final class CraftScoreboardManager implements ScoreboardManager {
diff --git a/patches/server/0011-Prevent-block-updates-in-non-loaded-or-non-owned-chu.patch b/patches/server/0011-Prevent-block-updates-in-non-loaded-or-non-owned-chu.patch
index bb1d972..c1c0310 100644
--- a/patches/server/0011-Prevent-block-updates-in-non-loaded-or-non-owned-chu.patch
+++ b/patches/server/0011-Prevent-block-updates-in-non-loaded-or-non-owned-chu.patch
@@ -9,10 +9,10 @@ add explicit block update suppression techniques, it's better
 than the server crashing.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2329d08c736ab04f640b0baef3a0d3dce6840a31..1480ddf3a1cc3164571a867be1f5aa02f4c66864 100644
+index 91f17ee2b6c9e1413b5bef62adcfe2a0d9537fef..474757fe16986d84f84302a22441c332d622d038 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1744,7 +1744,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1764,7 +1764,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              Direction enumdirection = (Direction) iterator.next();
              BlockPos blockposition1 = pos.relative(enumdirection);
  
@@ -22,10 +22,10 @@ index 2329d08c736ab04f640b0baef3a0d3dce6840a31..1480ddf3a1cc3164571a867be1f5aa02
  
                  if (iblockdata.is(Blocks.COMPARATOR)) {
 diff --git a/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java b/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
-index 05dfb1790a292f9f85b641377c2ca3675726c127..971fcb61915f8b5f3fc4cbe3f3e4c8d639abdee6 100644
+index 034a3bc5b5e526e28088a9715a41ad8ab843860b..42877ed3c59141072a551d0f0d6db7e0eef919a0 100644
 --- a/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
-@@ -127,9 +127,9 @@ public class DetectorRailBlock extends BaseRailBlock {
+@@ -134,9 +134,9 @@ public class DetectorRailBlock extends BaseRailBlock {
  
          while (iterator.hasNext()) {
              BlockPos blockposition1 = (BlockPos) iterator.next();
@@ -38,10 +38,10 @@ index 05dfb1790a292f9f85b641377c2ca3675726c127..971fcb61915f8b5f3fc4cbe3f3e4c8d6
  
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/PoweredRailBlock.java b/src/main/java/net/minecraft/world/level/block/PoweredRailBlock.java
-index 7fddb6fa8fd30ef88346a59f7867aae792f13772..b963f364b4763091c3b5d0f938eaa6798ffa4553 100644
+index b84c48902ef24fdae17578a304e6c93dc20c5dce..218c1954a7922c9e6bf6f34f9497f89ce1207eac 100644
 --- a/src/main/java/net/minecraft/world/level/block/PoweredRailBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/PoweredRailBlock.java
-@@ -97,9 +97,9 @@ public class PoweredRailBlock extends BaseRailBlock {
+@@ -104,9 +104,9 @@ public class PoweredRailBlock extends BaseRailBlock {
      }
  
      protected boolean isSameRailWithPower(Level world, BlockPos pos, boolean flag, int distance, RailShape shape) {
@@ -54,10 +54,10 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..b963f364b4763091c3b5d0f938eaa679
          } else {
              RailShape blockpropertytrackposition1 = (RailShape) iblockdata.getValue(PoweredRailBlock.SHAPE);
 diff --git a/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java b/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java
-index f695d81a646307846abb490b484f166be2993382..fe0ae679f3803156c253cc9caa166e7a9c6ddeed 100644
+index bf0e67921d96edde46a97543099f9c03634fca11..b64f0a30a0f7aee5ac9838a11756fdc5c93c36f6 100644
 --- a/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java
-@@ -193,8 +193,9 @@ public class RedStoneWireBlock extends Block {
+@@ -200,8 +200,9 @@ public class RedStoneWireBlock extends Block {
          while (iterator.hasNext()) {
              Direction enumdirection = (Direction) iterator.next();
              RedstoneSide blockpropertyredstoneside = (RedstoneSide) state.getValue((Property) RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(enumdirection));
diff --git a/patches/server/0013-Skip-worldstate-access-when-waking-players-up-during.patch b/patches/server/0013-Skip-worldstate-access-when-waking-players-up-during.patch
index 60653cc..d89a461 100644
--- a/patches/server/0013-Skip-worldstate-access-when-waking-players-up-during.patch
+++ b/patches/server/0013-Skip-worldstate-access-when-waking-players-up-during.patch
@@ -9,10 +9,10 @@ data deserialization and is racey even in Vanilla. But in Folia,
 some accesses may throw and as such we need to fix this directly.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 89f7825a8cf415f3c2e0ddcb41c159a84d2e4bd1..97bfb92e52c3c5ef1cd22afe2b97c204eb45025a 100644
+index c66815bd2a13554aec7176258f8fae542d668d3f..a22173984c418e648ae5308de26fbd5f9cbe6973 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -637,7 +637,7 @@ public class ServerPlayer extends Player {
+@@ -644,7 +644,7 @@ public class ServerPlayer extends Player {
          this.getBukkitEntity().readExtraData(nbt); // CraftBukkit
  
          if (this.isSleeping()) {
@@ -22,10 +22,10 @@ index 89f7825a8cf415f3c2e0ddcb41c159a84d2e4bd1..97bfb92e52c3c5ef1cd22afe2b97c204
  
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index db4f220bc9767ced5a98addc9e8b440b4f4f5b03..82996d0c2891871bd6ef9ff81aef123add08ebda 100644
+index d74c6ee198daa125d78cd815e1e0d1f7194caeac..15e441ba4d5286e7bf677f7c0ad5fb8f62437d72 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -4347,6 +4347,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4360,6 +4360,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
              }
  
          });
diff --git a/patches/server/0017-Sync-vehicle-position-to-player-position-on-player-d.patch b/patches/server/0017-Sync-vehicle-position-to-player-position-on-player-d.patch
index d645527..e9464fc 100644
--- a/patches/server/0017-Sync-vehicle-position-to-player-position-on-player-d.patch
+++ b/patches/server/0017-Sync-vehicle-position-to-player-position-on-player-d.patch
@@ -7,10 +7,10 @@ This allows the player to be re-positioned before logging into
 the world without causing thread checks to trip on Folia.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 41ba8950b3aada5eea55a0db841c6b9291262bf2..4b1ee6b9351aeb96ac7a3c2aaa8c464bbca91e22 100644
+index bc31d4dfd6fca354c093f552901a59e5b83c92d7..72c32a9b4b0606162a0f994b3d8170f0fe4d5022 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -516,7 +516,13 @@ public abstract class PlayerList {
+@@ -514,7 +514,13 @@ public abstract class PlayerList {
              CompoundTag nbttagcompound1 = nbttagcompound.getCompound("RootVehicle");
              // CraftBukkit start
              ServerLevel finalWorldServer = worldserver1;
diff --git a/patches/server/0018-Region-profiler.patch b/patches/server/0018-Region-profiler.patch
index 8d3ca1d..ad811af 100644
--- a/patches/server/0018-Region-profiler.patch
+++ b/patches/server/0018-Region-profiler.patch
@@ -1361,10 +1361,10 @@ index 0000000000000000000000000000000000000000..e36fd244f71a92d11c6ee45944948be5
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
-index c06bed93f6a701b1639c1cc334802e7b802431a5..e635f21e3c9c000da9c9da9bf2ec9ed87f664da5 100644
+index 98fb69a9adeb6eaab199aec127692acb07f56808..7cc624505931dcb6696c3ef3ee3bbea74f77ad06 100644
 --- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java
 +++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
-@@ -50,7 +50,10 @@ public class PacketUtils {
+@@ -51,7 +51,10 @@ public class PacketUtils {
                  if (listener.shouldHandleMessage(packet)) {
                      co.aikar.timings.Timing timing = co.aikar.timings.MinecraftTimings.getPacketTiming(packet); // Paper - timings
                      try (co.aikar.timings.Timing ignored = timing.startTiming()) { // Paper - timings
@@ -1373,13 +1373,13 @@ index c06bed93f6a701b1639c1cc334802e7b802431a5..e635f21e3c9c000da9c9da9bf2ec9ed8
                          packet.handle(listener);
 +                        } finally { profiler.stopTimer(packetTimerId); } // Folia - profiler
                      } catch (Exception exception) {
-                         if (exception instanceof ReportedException) {
-                             ReportedException reportedexception = (ReportedException) exception;
+                         label25:
+                         {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5ded3dbc379f199ed735b6ce0ebf6a2e3485f93b..4b189b54c8f326939a7b9ffdfb35edfb7d8cee63 100644
+index 844424e7488eb42753f50e0e998aebf93c912877..d04862c5f06bafb67b055959ddfe8334914cf5c7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1462,6 +1462,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1585,6 +1585,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // Folia start - region threading
      public void tickServer(long startTime, long scheduledEnd, long targetBuffer,
                             io.papermc.paper.threadedregions.TickRegions.TickRegionData region) {
@@ -1387,7 +1387,7 @@ index 5ded3dbc379f199ed735b6ce0ebf6a2e3485f93b..4b189b54c8f326939a7b9ffdfb35edfb
          if (region != null) {
              region.world.getCurrentWorldData().updateTickData();
              if (region.world.checkInitialised.get() != ServerLevel.WORLD_INIT_CHECKED) {
-@@ -1496,10 +1497,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1619,10 +1620,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          // Folia start - region threading
          if (region != null) {
@@ -1404,7 +1404,7 @@ index 5ded3dbc379f199ed735b6ce0ebf6a2e3485f93b..4b189b54c8f326939a7b9ffdfb35edfb
              for (Entity entity : region.world.getCurrentWorldData().getLocalEntitiesCopy()) {
                  if (!io.papermc.paper.util.TickThread.isTickThreadFor(entity) || entity.isRemoved()) {
                      continue;
-@@ -1507,10 +1514,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1630,10 +1637,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  org.bukkit.craftbukkit.entity.CraftEntity bukkit = entity.getBukkitEntityRaw();
                  if (bukkit != null) {
                      bukkit.taskScheduler.executeTick();
@@ -1420,7 +1420,7 @@ index 5ded3dbc379f199ed735b6ce0ebf6a2e3485f93b..4b189b54c8f326939a7b9ffdfb35edfb
          }
          // Folia end - region threading
  
-@@ -1528,6 +1540,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1653,6 +1665,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          this.profiler.push("save");
          final boolean fullSave = autosavePeriod > 0 && io.papermc.paper.threadedregions.RegionizedServer.getCurrentTick() % autosavePeriod == 0; // Folia - region threading
@@ -1428,7 +1428,7 @@ index 5ded3dbc379f199ed735b6ce0ebf6a2e3485f93b..4b189b54c8f326939a7b9ffdfb35edfb
          try {
              this.isSaving = true;
              if (playerSaveInterval > 0) {
-@@ -1541,6 +1554,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1666,6 +1679,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          } finally {
              this.isSaving = false;
          }
@@ -1436,7 +1436,7 @@ index 5ded3dbc379f199ed735b6ce0ebf6a2e3485f93b..4b189b54c8f326939a7b9ffdfb35edfb
          this.profiler.pop();
          // Paper end
          io.papermc.paper.util.CachedLists.reset(); // Paper
-@@ -1598,6 +1612,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1748,6 +1762,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void tickChildren(BooleanSupplier shouldKeepTicking, io.papermc.paper.threadedregions.TickRegions.TickRegionData region) { // Folia - region threading
@@ -1444,7 +1444,7 @@ index 5ded3dbc379f199ed735b6ce0ebf6a2e3485f93b..4b189b54c8f326939a7b9ffdfb35edfb
          final io.papermc.paper.threadedregions.RegionizedWorldData regionizedWorldData = io.papermc.paper.threadedregions.TickRegionScheduler.getCurrentRegionizedWorldData(); // Folia - regionised ticking
          if (region == null) this.getPlayerList().getPlayers().forEach((entityplayer) -> { // Folia - region threading
              entityplayer.connection.suspendFlushing();
-@@ -1664,12 +1679,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1814,12 +1829,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              try {
                  worldserver.timings.doTick.startTiming(); // Spigot
@@ -1518,10 +1518,10 @@ index f640a0b8742a8362401f91a9a0f8fbb31885dca0..50597a8b45bbd7dcc40b361da78358d9
      // Folia end - region threading - replace entity tracking ticking
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 4ed40924942bc3252fb1a533190765fbfdb2ba72..b9b1dfe04eda8498f0ceff0aee66489d2a02b814 100644
+index a363c9d74d2a50a3bb3c3e323f7cf921c50bbff7..d248c0492a34c11fb96c9dd6f0a3d180ee846c51 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -436,16 +436,23 @@ public class ServerChunkCache extends ChunkSource {
+@@ -434,16 +434,23 @@ public class ServerChunkCache extends ChunkSource {
  
      @Override
      public void tick(BooleanSupplier shouldKeepTicking, boolean tickChunks) {
@@ -1543,76 +1543,76 @@ index 4ed40924942bc3252fb1a533190765fbfdb2ba72..b9b1dfe04eda8498f0ceff0aee66489d
              this.tickChunks();
 +            } finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.CHUNK_TICK); } // Folia - profiler
              this.level.timings.chunks.stopTiming(); // Paper - timings
+             this.chunkMap.tick();
          }
- 
-@@ -459,6 +466,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -458,6 +465,7 @@ public class ServerChunkCache extends ChunkSource {
  
      private void tickChunks() {
          io.papermc.paper.threadedregions.RegionizedWorldData regionizedWorldData = this.level.getCurrentWorldData(); // Folia - region threading
 +        final ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle profiler = io.papermc.paper.threadedregions.TickRegionScheduler.getProfiler(); // Folia - profiler
-         long i = this.level.getGameTime();
+         //long i = this.level.getGameTime(); // Folia - region threading
          long j = 1; // Folia - region threading
  
-@@ -480,6 +488,7 @@ public class ServerChunkCache extends ChunkSource {
-             int l = this.distanceManager.getNaturalSpawnChunkCount();
-             // Paper start - per player mob spawning
-             NaturalSpawner.SpawnState spawnercreature_d; // moved down
-+            profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.MOB_SPAWN_ENTITY_COUNT); try { // Folia - profiler
-             if ((this.spawnFriendlies || this.spawnEnemies) && this.level.paperConfig().entities.spawning.perPlayerMobSpawns) { // don't count mobs when animals and monsters are disabled
-                 // re-set mob counts
-                 for (ServerPlayer player : regionizedWorldData.getLocalPlayers()) { // Folia - region threading
-@@ -499,6 +508,7 @@ public class ServerChunkCache extends ChunkSource {
-             } else {
-                 spawnercreature_d = NaturalSpawner.createState(l, regionizedWorldData.getLoadedEntities(), this::getFullChunk, !this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new LocalMobCapCalculator(this.chunkMap) : null, false); // Folia - region threading
-             }
-+            } finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.MOB_SPAWN_ENTITY_COUNT); } // Folia - profiler
-             // Paper end
-             this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
+@@ -512,6 +520,7 @@ public class ServerChunkCache extends ChunkSource {
+                 // Paper start - per player mob spawning
+                 int naturalSpawnChunkCount = k;
+                 NaturalSpawner.SpawnState spawnercreature_d; // moved down
++                profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.MOB_SPAWN_ENTITY_COUNT); try { // Folia - profiler
+                 if ((this.spawnFriendlies || this.spawnEnemies) && this.level.paperConfig().entities.spawning.perPlayerMobSpawns) { // don't count mobs when animals and monsters are disabled
+                     // re-set mob counts
+                     for (ServerPlayer player : this.level.getLocalPlayers()) { // Folia - region threading
+@@ -531,6 +540,7 @@ public class ServerChunkCache extends ChunkSource {
+                 } else {
+                     spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, regionizedWorldData.getLoadedEntities(), this::getFullChunk, !this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new LocalMobCapCalculator(this.chunkMap) : null, false); // Folia - region threading - note: function only cares about loaded entities, doesn't need all
+                 }
++                } finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.MOB_SPAWN_ENTITY_COUNT); } // Folia - profiler
+                 // Paper end
+                 this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
  
-@@ -566,6 +576,9 @@ public class ServerChunkCache extends ChunkSource {
-             }
-             try {
-             // Paper end - optimise chunk tick iteration
-+            long spawnChunkCount = 0L; // Folia - profiler
-+            long randomChunkCount = 0L; // Folia - profiler
-+            profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.SPAWN_AND_RANDOM_TICK); try { // Folia - profiler
-             while (iterator1.hasNext()) {
-                 LevelChunk chunk1 = iterator1.next(); // Paper - optimise chunk tick iteration
-                 ChunkPos chunkcoordintpair = chunk1.getPos();
-@@ -596,15 +609,20 @@ public class ServerChunkCache extends ChunkSource {
-                 if (tick && chunk1.chunkStatus.isOrAfter(net.minecraft.server.level.FullChunkStatus.ENTITY_TICKING)) { // Paper - optimise chunk tick iteration
-                     chunk1.incrementInhabitedTime(j);
-                     if (spawn && flag2 && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair)) { // Spigot // Paper - optimise chunk tick iteration
-+                        ++spawnChunkCount; // Folia - profiler
-                         NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
-                     }
+@@ -592,6 +602,9 @@ public class ServerChunkCache extends ChunkSource {
+                 }
+                 try {
+                 // Paper end - optimise chunk tick iteration
++                long spawnChunkCount = 0L; // Folia - profiler
++                long randomChunkCount = 0L; // Folia - profiler
++                profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.SPAWN_AND_RANDOM_TICK); try { // Folia - profiler
+                 while (chunkIterator.hasNext()) {
+                     LevelChunk chunk1 = chunkIterator.next(); // Paper - optimise chunk tick iteration
+                     ChunkPos chunkcoordintpair = chunk1.getPos();
+@@ -623,15 +636,20 @@ public class ServerChunkCache extends ChunkSource {
+                         // Paper end - optimise chunk tick iteration
+                         chunk1.incrementInhabitedTime(j);
+                         if (spawn && flag && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair)) { // Spigot // Paper - optimise chunk tick iteration
++                            ++spawnChunkCount; // Folia - profiler
+                             NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
+                         }
  
-                     if (true || this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) { // Paper - optimise chunk tick iteration
-+                        ++randomChunkCount; // Folia - profiler
-                         this.level.tickChunk(chunk1, k);
-                         if ((chunksTicked++ & 1) == 0) net.minecraft.server.MinecraftServer.getServer().executeMidTickTasks(); // Paper
+                         if (true || this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) { // Paper - optimise chunk tick iteration
++                            ++randomChunkCount; // Folia - profiler
+                             this.level.tickChunk(chunk1, l);
+                             if ((chunksTicked++ & 1) == 0) net.minecraft.server.MinecraftServer.getServer().executeMidTickTasks(); // Paper
+                         }
                      }
                  }
-             }
-+            profiler.addCounter(ca.spottedleaf.leafprofiler.LProfilerRegistry.SPAWN_CHUNK_COUNT, spawnChunkCount); // Folia - profiler
-+            profiler.addCounter(ca.spottedleaf.leafprofiler.LProfilerRegistry.RANDOM_CHUNK_TICK_COUNT, randomChunkCount); // Folia - profiler
-+            } finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.SPAWN_AND_RANDOM_TICK); } // Folia - profiler
-             // Paper start - optimise chunk tick iteration
-             } finally {
-                 if (iterator1 instanceof io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet.Iterator safeIterator) {
-@@ -615,9 +633,11 @@ public class ServerChunkCache extends ChunkSource {
-             this.level.timings.chunkTicks.stopTiming(); // Paper
-             gameprofilerfiller.popPush("customSpawners");
-             if (flag2) {
-+                profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.MISC_MOB_SPAWN_TICK); try { // Folia - profiler
-                 try (co.aikar.timings.Timing ignored = this.level.timings.miscMobSpawning.startTiming()) { // Paper - timings
-                 this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies);
-                 } // Paper - timings
-+                } finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.MISC_MOB_SPAWN_TICK); } // Folia - profiler
++                profiler.addCounter(ca.spottedleaf.leafprofiler.LProfilerRegistry.SPAWN_CHUNK_COUNT, spawnChunkCount); // Folia - profiler
++                profiler.addCounter(ca.spottedleaf.leafprofiler.LProfilerRegistry.RANDOM_CHUNK_TICK_COUNT, randomChunkCount); // Folia - profiler
++                } finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.SPAWN_AND_RANDOM_TICK); } // Folia - profiler
+                 // Paper start - optimise chunk tick iteration
+                 } finally {
+                     if (chunkIterator instanceof io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet.Iterator safeIterator) {
+@@ -643,9 +661,11 @@ public class ServerChunkCache extends ChunkSource {
+ 
+                 gameprofilerfiller.popPush("customSpawners");
+                 if (flag) {
++                    profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.MISC_MOB_SPAWN_TICK); try { // Folia - profiler
+                     try (co.aikar.timings.Timing ignored = this.level.timings.miscMobSpawning.startTiming()) { // Paper - timings
+                     this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies);
+                     } // Paper - timings
++                    } finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.MISC_MOB_SPAWN_TICK); } // Folia - profiler
+                 }
              }
  
-             gameprofilerfiller.popPush("broadcast");
-@@ -626,6 +646,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -655,6 +675,7 @@ public class ServerChunkCache extends ChunkSource {
              // Paper start - optimise chunk tick iteration
              // Folia start - region threading
              if (!this.level.needsChangeBroadcasting.isEmpty()) {
@@ -1620,7 +1620,7 @@ index 4ed40924942bc3252fb1a533190765fbfdb2ba72..b9b1dfe04eda8498f0ceff0aee66489d
                  for (Iterator<ChunkHolder> iterator = this.level.needsChangeBroadcasting.iterator(); iterator.hasNext();) {
                      ChunkHolder holder = iterator.next();
                      if (!io.papermc.paper.util.TickThread.isTickThreadFor(holder.newChunkHolder.world, holder.pos)) {
-@@ -637,6 +658,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -666,6 +687,7 @@ public class ServerChunkCache extends ChunkSource {
                          iterator.remove();
                      }
                  }
@@ -1629,10 +1629,10 @@ index 4ed40924942bc3252fb1a533190765fbfdb2ba72..b9b1dfe04eda8498f0ceff0aee66489d
              // Folia end - region threading
              // Paper end - optimise chunk tick iteration
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 10cf0ffb2cf519f0904dbe709b9042d30d5fd827..724aa1d8147ea2fb5e46d291adacfb7e1f5b5f62 100644
+index 72af30b281f2bb1dd4beee746a1b3f7bebbc7260..8cf413e42d560d90dfcbcb1d61ed410e992a8f4c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -891,6 +891,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -893,6 +893,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      public void tick(BooleanSupplier shouldKeepTicking, io.papermc.paper.threadedregions.TickRegions.TickRegionData region) { // Folia - regionised ticking
          final io.papermc.paper.threadedregions.RegionizedWorldData regionizedWorldData = this.getCurrentWorldData(); // Folia - regionised ticking
@@ -1640,8 +1640,8 @@ index 10cf0ffb2cf519f0904dbe709b9042d30d5fd827..724aa1d8147ea2fb5e46d291adacfb7e
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          regionizedWorldData.setHandlingTick(true); // Folia - regionised ticking
-@@ -910,24 +911,34 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         if (!this.isDebug()) {
+@@ -921,9 +922,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         if (!this.isDebug() && flag) {
              j = regionizedWorldData.getRedstoneGameTime(); // Folia - region threading
              gameprofilerfiller.push("blockTicks");
 +            profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.BLOCK_TICK); try { // Folia - profiler
@@ -1654,13 +1654,16 @@ index 10cf0ffb2cf519f0904dbe709b9042d30d5fd827..724aa1d8147ea2fb5e46d291adacfb7e
              gameprofilerfiller.pop();
          }
          this.timings.scheduledBlocks.stopTiming(); // Paper
- 
+@@ -931,18 +936,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
          gameprofilerfiller.popPush("raid");
-         this.timings.raids.startTiming(); // Paper - timings
-+        profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.RAIDS_TICK); try { // Folia - profiler
-         this.raids.tick();
-+        } finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.RAIDS_TICK); } // Folia - profiler
-         this.timings.raids.stopTiming(); // Paper - timings
+         if (flag) {
+             this.timings.raids.startTiming(); // Paper - timings
++            profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.RAIDS_TICK); try { // Folia - profiler
+             this.raids.tick();
++            } finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.RAIDS_TICK); } // Folia - profiler
+             this.timings.raids.stopTiming(); // Paper - timings
+         }
+ 
          gameprofilerfiller.popPush("chunkSource");
          this.timings.chunkProviderTick.startTiming(); // Paper - timings
 +        profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.CHUNK_PROVIDER_TICK); try { // Folia - profiler
@@ -1668,22 +1671,23 @@ index 10cf0ffb2cf519f0904dbe709b9042d30d5fd827..724aa1d8147ea2fb5e46d291adacfb7e
 +        } finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.CHUNK_PROVIDER_TICK); } // Folia - profiler
          this.timings.chunkProviderTick.stopTiming(); // Paper - timings
          gameprofilerfiller.popPush("blockEvents");
-         this.timings.doSounds.startTiming(); // Spigot
-+        profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.BLOCK_EVENT_TICK); try { // Folia - profiler
-         this.runBlockEvents();
-+        } finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.BLOCK_EVENT_TICK); } // Folia - profiler
-         this.timings.doSounds.stopTiming(); // Spigot
-         regionizedWorldData.setHandlingTick(false); // Folia - regionised ticking
-         gameprofilerfiller.pop();
-@@ -941,6 +952,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         if (flag) {
+             this.timings.doSounds.startTiming(); // Spigot
++            profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.BLOCK_EVENT_TICK); try { // Folia - profiler
+             this.runBlockEvents();
++            } finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.BLOCK_EVENT_TICK); } // Folia - profiler
+             this.timings.doSounds.stopTiming(); // Spigot
+         }
+ 
+@@ -958,6 +969,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              gameprofilerfiller.push("entities");
              this.timings.tickEntities.startTiming(); // Spigot
-             if (this.dragonFight != null) {
+             if (this.dragonFight != null && flag) {
 +                profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.DRAGON_FIGHT_TICK); try { // Folia - profiler
                  if (io.papermc.paper.util.TickThread.isTickThreadFor(this, this.dragonFight.origin)) { // Folia - region threading
                  gameprofilerfiller.push("dragonFight");
                  this.dragonFight.tick();
-@@ -953,10 +965,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -970,10 +982,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
                          fightCenter
                      );
                  } // Folia end - region threading
@@ -1696,7 +1700,7 @@ index 10cf0ffb2cf519f0904dbe709b9042d30d5fd827..724aa1d8147ea2fb5e46d291adacfb7e
              regionizedWorldData.forEachTickingEntity((entity) -> { // Folia - regionised ticking
                  if (!entity.isRemoved()) {
                      if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
-@@ -984,10 +998,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1001,10 +1015,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      }
                  }
              });
@@ -1710,7 +1714,7 @@ index 10cf0ffb2cf519f0904dbe709b9042d30d5fd827..724aa1d8147ea2fb5e46d291adacfb7e
          }
  
          gameprofilerfiller.push("entityManagement");
-@@ -1047,12 +1064,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1064,12 +1081,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
@@ -1726,7 +1730,7 @@ index 10cf0ffb2cf519f0904dbe709b9042d30d5fd827..724aa1d8147ea2fb5e46d291adacfb7e
          }
  
      }
-@@ -1495,6 +1515,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1519,6 +1539,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Paper start- timings
          final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(entity);
          timer = isActive ? entity.getType().tickTimer.startTiming() : entity.getType().inactiveTickTimer.startTiming(); // Paper
@@ -1738,7 +1742,7 @@ index 10cf0ffb2cf519f0904dbe709b9042d30d5fd827..724aa1d8147ea2fb5e46d291adacfb7e
          try {
          // Paper end - timings
          entity.setOldPosAndRot();
-@@ -1520,7 +1545,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1544,7 +1569,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Folia end - region threading
          } else { entity.inactiveTick(); } // Paper - EAR 2
          this.getProfiler().pop();
@@ -1747,7 +1751,7 @@ index 10cf0ffb2cf519f0904dbe709b9042d30d5fd827..724aa1d8147ea2fb5e46d291adacfb7e
          Iterator iterator = entity.getPassengers().iterator();
  
          while (iterator.hasNext()) {
-@@ -1544,6 +1569,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1568,6 +1593,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  // Paper - EAR 2
                  final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(passenger);
                  co.aikar.timings.Timing timer = isActive ? passenger.getType().passengerTickTimer.startTiming() : passenger.getType().passengerInactiveTickTimer.startTiming(); // Paper
@@ -1759,7 +1763,7 @@ index 10cf0ffb2cf519f0904dbe709b9042d30d5fd827..724aa1d8147ea2fb5e46d291adacfb7e
                  try {
                  // Paper end
                  passenger.setOldPosAndRot();
-@@ -1583,7 +1613,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1607,7 +1637,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      this.tickPassenger(passenger, entity2);
                  }
  
@@ -1769,10 +1773,10 @@ index 10cf0ffb2cf519f0904dbe709b9042d30d5fd827..724aa1d8147ea2fb5e46d291adacfb7e
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 4b1ee6b9351aeb96ac7a3c2aaa8c464bbca91e22..7edaa7558e40942f94c459e9b480ef640146ec6b 100644
+index 72c32a9b4b0606162a0f994b3d8170f0fe4d5022..dfc0e3ce3ba88c3dbff909524de348fbe76de3a9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1325,6 +1325,7 @@ public abstract class PlayerList {
+@@ -1323,6 +1323,7 @@ public abstract class PlayerList {
  
      public void saveAll(int interval) {
          io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -1780,7 +1784,7 @@ index 4b1ee6b9351aeb96ac7a3c2aaa8c464bbca91e22..7edaa7558e40942f94c459e9b480ef64
          MinecraftTimings.savePlayers.startTiming(); // Paper
          int numSaved = 0;
          long now = System.nanoTime(); // Folia - region threading
-@@ -1336,7 +1337,9 @@ public abstract class PlayerList {
+@@ -1334,7 +1335,9 @@ public abstract class PlayerList {
              }
              // Folia end - region threading
              if (interval == -1 || now - entityplayer.lastSave >= timeInterval) { // Folia - region threading
@@ -1791,10 +1795,10 @@ index 4b1ee6b9351aeb96ac7a3c2aaa8c464bbca91e22..7edaa7558e40942f94c459e9b480ef64
                  if (interval != -1 && max != -1 && ++numSaved >= max) {
                      break;
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 73871f456a85bda1e51f54986d0e61fb629822e8..3f3494c20cd15a721090f1b36293562a6b834b14 100644
+index 940b8d0b89d7e55c938aefbe80ee71b0db3dacb8..a3a6c10f5b4157062a8a8d5ee4638c4e9d6fcf62 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -322,6 +322,13 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -326,6 +326,13 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
          return BuiltInRegistries.ENTITY_TYPE.getOptional(ResourceLocation.tryParse(id));
      }
  
@@ -1808,7 +1812,7 @@ index 73871f456a85bda1e51f54986d0e61fb629822e8..3f3494c20cd15a721090f1b36293562a
      public EntityType(EntityType.EntityFactory<T> factory, MobCategory spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet<Block> canSpawnInside, EntityDimensions dimensions, int maxTrackDistance, int trackTickInterval, FeatureFlagSet requiredFeatures) {
         // Paper start
          this(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnInside, dimensions, maxTrackDistance, trackTickInterval, requiredFeatures, "custom");
-@@ -332,6 +339,12 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -336,6 +343,12 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
          this.passengerTickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "passengerTick");
          this.passengerInactiveTickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "passengerInactiveTick");
          // Paper end
@@ -1822,10 +1826,10 @@ index 73871f456a85bda1e51f54986d0e61fb629822e8..3f3494c20cd15a721090f1b36293562a
          this.factory = factory;
          this.category = spawnGroup;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 1480ddf3a1cc3164571a867be1f5aa02f4c66864..c58ca3dd28b9c113a26feb1a7f05bd78c0dbd678 100644
+index 474757fe16986d84f84302a22441c332d622d038..9244aaa1be1a4ba2c6eec5bcaeea7c5c0081ac39 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -226,6 +226,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -229,6 +229,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return this.getCurrentWorldData().getLocalPlayers();
      }
      // Folia end - region ticking
@@ -1835,7 +1839,7 @@ index 1480ddf3a1cc3164571a867be1f5aa02f4c66864..c58ca3dd28b9c113a26feb1a7f05bd78
  
      protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
-@@ -318,6 +321,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -321,6 +324,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          this.minSection = io.papermc.paper.util.WorldUtil.getMinSection(this);
          this.maxSection = io.papermc.paper.util.WorldUtil.getMaxSection(this);
          // Paper end - optimise collisions
@@ -1845,7 +1849,7 @@ index 1480ddf3a1cc3164571a867be1f5aa02f4c66864..c58ca3dd28b9c113a26feb1a7f05bd78
      }
  
      // Paper start
-@@ -1295,17 +1301,21 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1304,17 +1310,21 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      protected void tickBlockEntities() {
@@ -1865,9 +1869,9 @@ index 1480ddf3a1cc3164571a867be1f5aa02f4c66864..c58ca3dd28b9c113a26feb1a7f05bd78
          this.timings.tileEntityTick.startTiming(); // Spigot
 +        profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.TILE_ENTITY_TICK); try { // Folia - profiler
          // Spigot start
-         // Iterator iterator = this.blockEntityTickers.iterator();
-         int tilesThisCycle = 0;
-@@ -1336,6 +1346,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+         // Iterator<TickingBlockEntity> iterator = this.blockEntityTickers.iterator();
+         boolean flag = this.tickRateManager().runsNormally();
+@@ -1347,6 +1357,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              }
          }
          blockEntityTickers.removeAll(toRemove); // Folia - regionised ticking
@@ -1876,10 +1880,10 @@ index 1480ddf3a1cc3164571a867be1f5aa02f4c66864..c58ca3dd28b9c113a26feb1a7f05bd78
          this.timings.tileEntityTick.stopTiming(); // Spigot
          regionizedWorldData.seTtickingBlockEntities(false); // Folia - regionised ticking
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntityType.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntityType.java
-index 2c1bc515468e2ba99d463021758fb72ef160fbe9..93cc5523a1c3637bf4f04ff4ef0f8ef6e1050a59 100644
+index 2e110da3502a7ac5ec4cc20510a3fac933569895..5aac65f37a0190c5d6a7175073fb0cc0f129de11 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntityType.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntityType.java
-@@ -78,10 +78,17 @@ public class BlockEntityType<T extends BlockEntity> {
+@@ -80,10 +80,17 @@ public class BlockEntityType<T extends BlockEntity> {
          }
  
          Type<?> type = Util.fetchChoiceType(References.BLOCK_ENTITY, id);
@@ -1898,7 +1902,7 @@ index 2c1bc515468e2ba99d463021758fb72ef160fbe9..93cc5523a1c3637bf4f04ff4ef0f8ef6
          this.factory = factory;
          this.validBlocks = blocks;
          this.dataType = type;
-@@ -126,7 +133,12 @@ public class BlockEntityType<T extends BlockEntity> {
+@@ -128,7 +135,12 @@ public class BlockEntityType<T extends BlockEntity> {
          }
  
          public BlockEntityType<T> build(Type<?> type) {
diff --git a/update.txt b/update.txt
new file mode 100644
index 0000000..cbbafad
--- /dev/null
+++ b/update.txt
@@ -0,0 +1,2 @@
+- Fix compile
+- Tick rate manager - what to do with you (also: check tickChunks [specifically inhabited time] with respect to how this works now)
\ No newline at end of file