Update upstream (Luminol)

fix crash in contain view (#44)

fix tps and mspt send in servux

README.md

@@ -4,6 +4,7 @@
 
 <h4>Lophine 是一个基于Luminol的分支，具有许多有用的优化和可配置的原版特性，目标是在Folia上实现更多生电的实现</h4>
 
+![Created At](https://img.shields.io/github/created-at/LuminolMC/Lophine?style=flat-square)
 [![License](https://img.shields.io/github/license/LuminolMC/Lophine?style=flat-square)](LICENSE.md)
 [![Issues](https://img.shields.io/github/issues/LuminolMC/Lophine?style=flat-square)](https://github.com/LuminolMC/Lophine/issues)
 ![Commit Activity](https://img.shields.io/github/commit-activity/w/LuminolMC/Lophine?style=flat-square)
@@ -17,6 +18,8 @@
 - 支持部分Bukkit插件
 - 可配置的原版特性
 - Tpsbar 支持
+- 针对folia bug的一些修复
+- linear和b_linear(linear的重新实现)存档格式支持
 - 对单线程区域性能的优化
 - 更多有用的功能
 

README_EN.md

@@ -5,6 +5,7 @@
 <h4>Lophine is a Luminol fork with many useful optimizations and configurable vanilla features, aims to provide
 more function for survival-usable circuit on folia</h4>
 
+![Created At](https://img.shields.io/github/created-at/LuminolMC/Lophine?style=flat-square)
 [![License](https://img.shields.io/github/license/LuminolMC/Lophine?style=flat-square)](LICENSE.md)
 [![Issues](https://img.shields.io/github/issues/LuminolMC/Lophine?style=flat-square)](https://github.com/LuminolMC/Lophine/issues)
 ![Commit Activity](https://img.shields.io/github/commit-activity/w/LuminolMC/Lophine?style=flat-square)
@@ -18,6 +19,8 @@ more function for survival-usable circuit on folia</h4>
 - Supported some Bukkit plugin
 - Configurable vanilla features
 - Tpsbar support
+- Useful fixes of bugs of folia
+- Linear and BufferedLinear(AKA. b_linear)(a reimplementation of linear) region format support
 - Useful optimizations to improve the performance of single threaded region
 - More functions
 

gradle.properties

@@ -4,7 +4,7 @@ mcVersion=1.21.8
 release=2
 # 0 for skip release, 1 for pre-release, 2 for release
 
-luminolRef=a86ef6c5283307c6a9176115b652d6ebbaaa2aa3
+luminolRef=8c71468b47e5179226a5035e0f0e7a1a06f7cc1e
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

lophine-server/build.gradle.kts.patch

@@ -51,7 +51,7 @@
      // Luminol start - Dependenices insert
      implementation("com.electronwill.night-config:toml:3.8.2") // Night config
      implementation("com.github.luben:zstd-jni:1.5.4-1")
-@@ -277,14 +_,14 @@
+@@ -276,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -70,7 +70,7 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
-@@ -448,7 +_,7 @@
+@@ -447,7 +_,7 @@
  }
  
  fill {

lophine-server/minecraft-patches/features/0003-Add-config-to-enable-datapack-command.patch

@@ -20,10 +20,10 @@ index 0d5ed9602492c8393088954105e9a19032067b8b..e2fc15d84fafde6847ecead23c551694
          DefaultGameModeCommands.register(this.dispatcher);
          //DialogCommand.register(this.dispatcher, context); // Folia - region threading - TODO
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 6675b83c9f15d0341dcf169ec3ac20f401c5d10b..e8c9e739de35313c0212bab97a202fa362fd0887 100644
+index 86d20d884fb59d0121bdcc291af1fc97b8bf603d..a0f1db50adf5163a671d3d9e9df7adb7de4250c6 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -2349,6 +2349,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2352,6 +2352,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return this.reloadResources(selectedIds, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.PLUGIN);
      }
  

lophine-server/minecraft-patches/features/0005-Add-config-to-enable-Cross-Region-Damage-trace.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add config to enable Cross Region Damage trace
 
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 06e41bca6b964ca71ea7bca547b03cdb3610ba31..b7bc75648634aefc549a69631ab6e401eb902e7d 100644
+index 11e6197dec541b28733715f0d7eaa4c7b834d632..6b7c92fdf562dfa46eee8e8acbc82b02fc3226c5 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -1341,6 +1341,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1345,6 +1345,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
              this.awardStat(Stats.ENTITY_KILLED_BY.get(killCredit.getType()));
              killCredit.awardKillScore(this, cause);
              this.createWitherRose(killCredit);
@@ -22,7 +22,7 @@ index 06e41bca6b964ca71ea7bca547b03cdb3610ba31..b7bc75648634aefc549a69631ab6e401
          }
  
          this.level().broadcastEntityEvent(this, (byte)3);
-@@ -1364,6 +1371,24 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1368,6 +1375,24 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
      }
      // Leaves end - exp fix
  

lophine-server/minecraft-patches/features/0009-Leaves-Leaves-Protocol-Core.patch

@@ -58,7 +58,7 @@ index fb263fa1f30a7dfcb7ec2656abfb38e5fe88eac9..56fd1ed7ccaf96e7eedea60fbdbf7f93
          };
      }
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index e8c9e739de35313c0212bab97a202fa362fd0887..c990e80f16d03967c9bb6fc5f48f145c01948209 100644
+index a0f1db50adf5163a671d3d9e9df7adb7de4250c6..af13707933af14171447d5ab6faacb64ddf194a7 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -305,6 +305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -69,7 +69,7 @@ index e8c9e739de35313c0212bab97a202fa362fd0887..c990e80f16d03967c9bb6fc5f48f145c
  
      @Override
      public <V> CompletableFuture<V> submit(java.util.function.Supplier<V> task) {
-@@ -2223,9 +2224,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2226,9 +2227,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return false;
      }
  
@@ -168,7 +168,7 @@ index 714813cba67da4a737682fe9276cb0d96fea336d..9677a3d62de11dafc8b9debe7a18ee6d
          this.connection.setReadOnly();
          // CraftBukkit - Don't wait
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 5c21fc0c749973d17df690fe7e2eab597b198131..8aea58c7797940929944973380b6ab67f177fa56 100644
+index 4ef2816210f06082f2209c51d04aad6bb188232b..593dbcda4b497291eb1ecdc64b947a8d279f8be6 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -423,6 +423,8 @@ public abstract class PlayerList {
@@ -188,7 +188,7 @@ index 5c21fc0c749973d17df690fe7e2eab597b198131..8aea58c7797940929944973380b6ab67
          // Paper end - Fix kick event leave message not being sent
          ServerLevel serverLevel = player.level();
          player.awardStat(Stats.LEAVE_GAME);
-@@ -1522,6 +1525,7 @@ public abstract class PlayerList {
+@@ -1520,6 +1523,7 @@ public abstract class PlayerList {
              serverPlayer.connection.send(clientboundUpdateRecipesPacket);
              serverPlayer.getRecipeBook().sendInitialRecipeBook(serverPlayer);
          }

lophine-server/minecraft-patches/features/0010-Leaves-Disable-packet-limit.patch

@@ -8,10 +8,10 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/6a2b9ee6b330cd18b
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
-index 6dc5f3e88a3886b03b99d59b317085fdc3e2fa9a..e556bcaf2a5863073a047947f5962179d054e8d9 100644
+index 9c7366fce56f2c8105c2e5b48f8d618e028f2604..7ab1d97081ffa8cd7ce69cf3165a312697f1fdbc 100644
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
-@@ -280,8 +280,8 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -281,8 +281,8 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
                  if (this.stopReadingPackets) {
                      return;
                  }
@@ -23,7 +23,7 @@ index 6dc5f3e88a3886b03b99d59b317085fdc3e2fa9a..e556bcaf2a5863073a047947f5962179
                      synchronized (PACKET_LIMIT_LOCK) {
                          if (this.allPacketCounts != null) {
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 68f0023c4234585a8385a830ed410883c8bd1549..d017cfc5b97552388d8f9ff80ca31b0972b80a2e 100644
+index 227f0c315582b9c499915bebfb820049839466e6..1d52376f034dc5690e8b399512146b47b92c3c14 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -856,7 +856,7 @@ public class ServerGamePacketListenerImpl
@@ -51,7 +51,7 @@ index 68f0023c4234585a8385a830ed410883c8bd1549..d017cfc5b97552388d8f9ff80ca31b09
          // CraftBukkit start - replaced with thread safe throttle
          if (org.spigotmc.SpigotConfig.enableSpamExclusions) {
              for (String exclude : org.spigotmc.SpigotConfig.spamExclusions) {
-@@ -3333,7 +3335,7 @@ public class ServerGamePacketListenerImpl
+@@ -3335,7 +3337,7 @@ public class ServerGamePacketListenerImpl
      @Override
      public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
          // Paper start - auto recipe limit

lophine-server/minecraft-patches/features/0011-Leaves-Item-overstack-util.patch

@@ -28,7 +28,7 @@ index 643797124fe5a4489d0b7419b7e600c04f283ef2..04b4100da96aad50f08e8c59200eec93
  
      public String serialize(HolderLookup.Provider levelRegistry) {
 diff --git a/net/minecraft/server/commands/GiveCommand.java b/net/minecraft/server/commands/GiveCommand.java
-index 5a1c21b05545a03fbb00cf734605049870d3eecb..a0459bc6b2241e7fca74bfbfce058882a8ad7f49 100644
+index f7002d6752aa03603eb06e298ba1d7130cf13826..72c87f7c0392d087440db9d267a608598f6feb6d 100644
 --- a/net/minecraft/server/commands/GiveCommand.java
 +++ b/net/minecraft/server/commands/GiveCommand.java
 @@ -55,7 +55,7 @@ public class GiveCommand {
@@ -41,10 +41,10 @@ index 5a1c21b05545a03fbb00cf734605049870d3eecb..a0459bc6b2241e7fca74bfbfce058882
          if (count > i) {
              source.sendFailure(Component.translatable("commands.give.failed.toomanyitems", i, itemStack.getDisplayName()));
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d017cfc5b97552388d8f9ff80ca31b0972b80a2e..a684f5edf420d9655046de872c54e0c1a89103cf 100644
+index 1d52376f034dc5690e8b399512146b47b92c3c14..4b215dc69887df9382bde4cfa2f37afadfe1bcb2 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3078,7 +3078,7 @@ public class ServerGamePacketListenerImpl
+@@ -3079,7 +3079,7 @@ public class ServerGamePacketListenerImpl
                                              } else if (slot.mayPlace(cursor)) {
                                                  if (ItemStack.isSameItemSameComponents(clickedItem, cursor)) {
                                                      int toPlace = packet.buttonNum() == 0 ? cursor.getCount() : 1;
@@ -53,7 +53,7 @@ index d017cfc5b97552388d8f9ff80ca31b0972b80a2e..a684f5edf420d9655046de872c54e0c1
                                                      toPlace = Math.min(toPlace, slot.container.getMaxStackSize() - clickedItem.getCount());
                                                      if (toPlace == 1) {
                                                          action = InventoryAction.PLACE_ONE;
-@@ -3114,7 +3114,7 @@ public class ServerGamePacketListenerImpl
+@@ -3115,7 +3115,7 @@ public class ServerGamePacketListenerImpl
                                                  }
                                              } else if (ItemStack.isSameItemSameComponents(cursor, clickedItem)) {
                                                  if (clickedItem.getCount() >= 0) {
@@ -62,15 +62,15 @@ index d017cfc5b97552388d8f9ff80ca31b0972b80a2e..a684f5edf420d9655046de872c54e0c1
                                                          // As of 1.5, this is result slots only
                                                          action = InventoryAction.PICKUP_ALL;
                                                      }
-@@ -3325,6 +3325,7 @@ public class ServerGamePacketListenerImpl
+@@ -3326,6 +3326,7 @@ public class ServerGamePacketListenerImpl
                          this.player.containerMenu.broadcastFullState();
                      } else {
                          this.player.containerMenu.broadcastChanges();
 +                        if (org.leavesmc.leaves.util.ItemOverstackUtils.hasOverstackingItem()) this.player.containerMenu.broadcastCarriedItem(); // Leaves - item over-stack util - force send carried item
                      }
+                     if (packet.buttonNum() == Inventory.SLOT_OFFHAND && this.player.containerMenu != this.player.inventoryMenu) this.player.containerSynchronizer.sendOffHandSlotChange(); // Paper - update offhand data when the player is clicking in an inventory not their own as the sychronizer does not include offhand slots
                      if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.updateEquipmentOnPlayerActions) this.player.detectEquipmentUpdates(); // Paper - Force update attributes.
-                 }
-@@ -3435,7 +3436,7 @@ public class ServerGamePacketListenerImpl
+@@ -3437,7 +3438,7 @@ public class ServerGamePacketListenerImpl
              }
  
              boolean flag1 = packet.slotNum() >= 1 && packet.slotNum() <= 45;
@@ -79,7 +79,7 @@ index d017cfc5b97552388d8f9ff80ca31b0972b80a2e..a684f5edf420d9655046de872c54e0c1
              if (flag || (flag1 && !ItemStack.matches(this.player.inventoryMenu.getSlot(packet.slotNum()).getItem(), packet.itemStack()))) { // Insist on valid slot
                  // CraftBukkit start - Call click event
                  org.bukkit.inventory.InventoryView inventory = this.player.inventoryMenu.getBukkitView();
-@@ -3477,6 +3478,7 @@ public class ServerGamePacketListenerImpl
+@@ -3479,6 +3480,7 @@ public class ServerGamePacketListenerImpl
                  this.player.inventoryMenu.getSlot(packet.slotNum()).setByPlayer(itemStack);
                  this.player.inventoryMenu.setRemoteSlot(packet.slotNum(), itemStack);
                  this.player.inventoryMenu.broadcastChanges();
@@ -229,7 +229,7 @@ index 02d2efef2dc0f0e12eac0c71fa290af706f7694d..99f109e2653eff10c011f380694bd77a
  
      default SlotAccess getChestVehicleSlot(final int index) {
 diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 9b6cd35e4dfa894069238a1365db16050aa5542b..7e9bfb433a252bb4211e490365265d35590f2474 100644
+index 9d8ab94f84f4523a2562f9eeb3410554e4269e46..87d1cf9ddfb3124069ff3ff921f2e62589562220 100644
 --- a/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -295,6 +295,13 @@ public abstract class AbstractContainerMenu {

lophine-server/minecraft-patches/features/0016-Paper-Fix-quick-craft.patch

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sat, 26 Jul 2025 13:40:28 +0800
-Subject: [PATCH] Paper: Fix quick craft
-
-Co-authored by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-As a part of : Paper (https://github.com/PaperMC/Paper/pull/11831/files#diff-3991edc9191addaab9f9701589f8fb4a05001c6f3c9ce1f51d22001f8de805ca)
-Licensed under: MIT (https://github.com/PaperMC/Paper/blob/main/licenses/MIT.md)
-
-diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 5369a6597e48ed9f0d8f7f0b9685ce4950df4fe5..919628d93add71d9b30cae29587a0049cce6973d 100644
---- a/net/minecraft/world/entity/LivingEntity.java
-+++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -4012,11 +4012,6 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
-             return null;
-         } else {
-             double d = this.getEyeY() - 0.3F;
--            // Paper start
--            final ItemStack tmp = stack.copy();
--            stack.setCount(0);
--            stack = tmp;
--            // Paper end
-             ItemEntity itemEntity = new ItemEntity(this.level(), this.getX(), d, this.getZ(), stack);
-             itemEntity.setPickUpDelay(40);
-             if (includeThrower) {

lophine-server/minecraft-patches/features/0016-Purpur-Barrels-and-enderchests-6-rows.patch

@@ -8,10 +8,10 @@ As part of: Purpur (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18
 Licensed under: MIT (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/LICENSE)
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 8aea58c7797940929944973380b6ab67f177fa56..9c4e5789f6881ca300cc183294e50b03dd03f6c6 100644
+index 593dbcda4b497291eb1ecdc64b947a8d279f8be6..661f797b39853104b16d75ca7ba0eda156a74af3 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -1089,6 +1089,10 @@ public abstract class PlayerList {
+@@ -1087,6 +1087,10 @@ public abstract class PlayerList {
          player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
          this.server.getCommands().sendCommands(player);
          } // Paper - Add sendOpLevel API

lophine-server/minecraft-patches/features/0017-Spawn-invulnerable-time.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn invulnerable time
 
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index b7bc75648634aefc549a69631ab6e401eb902e7d..0e2d575200f3ff3ec1600a0663152e3c37ea67b0 100644
+index 6b7c92fdf562dfa46eee8e8acbc82b02fc3226c5..144b2c9396b8162f9cce8b343d998907bf7fb5aa 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -232,6 +232,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -24,7 +24,7 @@ index b7bc75648634aefc549a69631ab6e401eb902e7d..0e2d575200f3ff3ec1600a0663152e3c
          if (this.invulnerableTime > 0) {
              this.invulnerableTime--;
          }
-@@ -1431,6 +1433,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1435,6 +1437,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          if (this.isInvulnerableTo(level, damageSource)) {
              return false;
          } else {

lophine-server/minecraft-patches/features/0021-Disable-some-check-for-operators.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable some check for operators
 
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a684f5edf420d9655046de872c54e0c1a89103cf..105675bef05408bd5baf1b6129c0392065bbe79d 100644
+index 4b215dc69887df9382bde4cfa2f37afadfe1bcb2..3ce1e5a7d7095c15250b94d032587f584119824d 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -367,7 +367,7 @@ public class ServerGamePacketListenerImpl

lophine-server/paper-patches/features/0003-Leaves-Leaves-Protocol-Core.patch

@@ -8,10 +8,10 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/ea91106ae57fc4cc1
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 44b7ac045c028f3bc940d78f158079e20582f4b8..bdcd25b98fa8189af874e4715db7d4440752756e 100644
+index 4f7077b592f84334483f8edf3656fccd5b90a9ca..26d5a96edd283a8f8fd50222e2671cef2c4b257b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -496,6 +496,7 @@ public final class CraftServer implements Server {
+@@ -497,6 +497,7 @@ public final class CraftServer implements Server {
          this.potionBrewer = new io.papermc.paper.potion.PaperPotionBrewer(console); // Paper - custom potion mixes
          datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
          if (false) this.spark = new io.papermc.paper.SparksFly(this); // Paper - spark // Luminol - Force disable builtin spark
@@ -19,7 +19,7 @@ index 44b7ac045c028f3bc940d78f158079e20582f4b8..bdcd25b98fa8189af874e4715db7d444
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -1112,6 +1113,7 @@ public final class CraftServer implements Server {
+@@ -1115,6 +1116,7 @@ public final class CraftServer implements Server {
          if (false) this.spark.registerCommandBeforePlugins(this); // Paper - spark // Luminol - Force disable builtin spark
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/Context.java

@@ -1,3 +1,20 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Leaves is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package org.leavesmc.leaves.protocol.core;
 
 import com.mojang.authlib.GameProfile;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/IdentifierSelector.java

@@ -1,3 +1,20 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Leaves is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package org.leavesmc.leaves.protocol.core;
 
 import net.minecraft.server.level.ServerPlayer;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/LeavesCustomPayload.java

@@ -1,3 +1,21 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Leaves is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
 package org.leavesmc.leaves.protocol.core;
 
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/LeavesProtocol.java

@@ -1,3 +1,21 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Leaves is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
 package org.leavesmc.leaves.protocol.core;
 
 import java.lang.annotation.ElementType;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/LeavesProtocolManager.java

@@ -1,3 +1,21 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Leaves is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
 package org.leavesmc.leaves.protocol.core;
 
 import com.mojang.logging.LogUtils;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/ProtocolHandler.java

@@ -1,3 +1,21 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Leaves is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
 package org.leavesmc.leaves.protocol.core;
 
 import net.minecraft.server.level.ServerPlayer;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/ProtocolUtils.java

@@ -1,3 +1,21 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Leaves is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
 package org.leavesmc.leaves.protocol.core;
 
 import io.netty.buffer.ByteBuf;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/AbstractInvokerHolder.java

@@ -1,3 +1,20 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Leaves is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package org.leavesmc.leaves.protocol.core.invoker;
 
 import org.jetbrains.annotations.NotNull;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/BytebufReceiverInvokerHolder.java

@@ -1,3 +1,20 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Leaves is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package org.leavesmc.leaves.protocol.core.invoker;
 
 import net.minecraft.network.FriendlyByteBuf;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/EmptyInvokerHolder.java

@@ -1,3 +1,20 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Leaves is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package org.leavesmc.leaves.protocol.core.invoker;
 
 import org.leavesmc.leaves.protocol.core.LeavesProtocol;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/InitInvokerHolder.java

@@ -1,3 +1,20 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Leaves is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package org.leavesmc.leaves.protocol.core.invoker;
 
 import org.leavesmc.leaves.protocol.core.LeavesProtocol;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/MinecraftRegisterInvokerHolder.java

@@ -1,3 +1,20 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Leaves is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package org.leavesmc.leaves.protocol.core.invoker;
 
 import net.minecraft.resources.ResourceLocation;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/PayloadReceiverInvokerHolder.java

@@ -1,3 +1,20 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Leaves is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package org.leavesmc.leaves.protocol.core.invoker;
 
 import org.leavesmc.leaves.protocol.core.IdentifierSelector;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/invoker/PlayerInvokerHolder.java

@@ -1,3 +1,20 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Leaves is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package org.leavesmc.leaves.protocol.core.invoker;
 
 import net.minecraft.server.level.ServerPlayer;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/servux/ServuxEntityDataProtocol.java

@@ -29,8 +29,6 @@ import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import org.bukkit.Bukkit;
-import org.leavesmc.leaves.plugin.MinecraftInternalPlugin;
 import org.leavesmc.leaves.protocol.core.LeavesCustomPayload;
 import org.leavesmc.leaves.protocol.core.LeavesProtocol;
 import org.leavesmc.leaves.protocol.core.ProtocolHandler;
@@ -102,27 +100,37 @@ public class ServuxEntityDataProtocol implements LeavesProtocol {
     }
 
     public static void onBlockEntityRequest(ServerPlayer player, BlockPos pos) {
-        Bukkit.getGlobalRegionScheduler().run(MinecraftInternalPlugin.INSTANCE, (task) -> {
-            BlockEntity be = player.level().getBlockEntity(pos);
-            CompoundTag nbt = be != null ? be.saveWithFullMetadata(player.registryAccess()) : new CompoundTag();
+        io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(
+                player.level(),
+                ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(player.position()),
+                ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkZ(player.position()),
+                () -> {
+                    BlockEntity be = player.level().getBlockEntity(pos);
+                    CompoundTag nbt = be != null ? be.saveWithFullMetadata(player.registryAccess()) : new CompoundTag();
 
-            EntityDataPayload payload = new EntityDataPayload(EntityDataPayloadType.PACKET_S2C_BLOCK_NBT_RESPONSE_SIMPLE);
-            payload.pos = pos.immutable();
-            payload.nbt.merge(nbt);
-            sendPacket(player, payload);
-        });
+                    EntityDataPayload payload = new EntityDataPayload(EntityDataPayloadType.PACKET_S2C_BLOCK_NBT_RESPONSE_SIMPLE);
+                    payload.pos = pos.immutable();
+                    payload.nbt.merge(nbt);
+                    sendPacket(player, payload);
+                }
+        );
     }
 
     public static void onEntityRequest(ServerPlayer player, int entityId) {
-        Bukkit.getGlobalRegionScheduler().run(MinecraftInternalPlugin.INSTANCE, (task) -> {
-            Entity entity = player.level().getEntity(entityId);
-            CompoundTag nbt = TagUtil.saveEntityWithoutId(entity);
+        io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(
+                player.level(),
+                ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(player.position()),
+                ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkZ(player.position()),
+                () -> {
+                    Entity entity = player.level().getEntity(entityId);
+                    CompoundTag nbt = TagUtil.saveEntityWithoutId(entity);
 
-            EntityDataPayload payload = new EntityDataPayload(EntityDataPayloadType.PACKET_S2C_ENTITY_NBT_RESPONSE_SIMPLE);
-            payload.entityId = entityId;
-            payload.nbt.merge(nbt);
-            sendPacket(player, payload);
-        });
+                    EntityDataPayload payload = new EntityDataPayload(EntityDataPayloadType.PACKET_S2C_ENTITY_NBT_RESPONSE_SIMPLE);
+                    payload.entityId = entityId;
+                    payload.nbt.merge(nbt);
+                    sendPacket(player, payload);
+                }
+        );
     }
 
     public static void sendPacket(ServerPlayer player, EntityDataPayload payload) {

lophine-server/src/main/java/org/leavesmc/leaves/protocol/servux/ServuxHudDataProtocol.java

@@ -17,6 +17,8 @@
 
 package org.leavesmc.leaves.protocol.servux;
 
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.Table;
 import com.mojang.serialization.DataResult;
 import io.netty.buffer.Unpooled;
 import net.minecraft.core.BlockPos;
@@ -54,7 +56,7 @@ public class ServuxHudDataProtocol implements LeavesProtocol {
 
     private static final HashMap<ServerPlayer, List<DataLogger.Type>> loggerPlayers = new HashMap<>();
     private static final HashMap<DataLogger.Type, DataLogger<?>> LOGGERS = new HashMap<>();
-    private static final HashMap<DataLogger.Type, Tag> DATA = new HashMap<>();
+    private static final Table<DataLogger.Type, ServerPlayer, Tag> DATA = HashBasedTable.create();
 
     public static boolean refreshSpawnMetadata = false;
 
@@ -237,12 +239,16 @@ public class ServuxHudDataProtocol implements LeavesProtocol {
         MinecraftServer server = MinecraftServer.getServer();
 
         if (server.getTickCount() % fun.bm.lophine.config.modules.misc.SurvuxProtocolConfig.hudUpdateInterval == 0) {
-            DATA.clear();
             LOGGERS.forEach((type, logger) -> {
                 if (!isLoggerTypeEnabled(type)) {
                     return;
                 }
-                DATA.put(type, logger.getResult(server));
+                for (ServerPlayer player : players) {
+                    Tag ret = logger.getResult(server, this, player);
+                    if (ret != null) {
+                        DATA.put(type, player, ret);
+                    }
+                }
             });
         }
 
@@ -254,14 +260,20 @@ public class ServuxHudDataProtocol implements LeavesProtocol {
 
             CompoundTag nbt = new CompoundTag();
             for (DataLogger.Type type : list) {
-                if (DATA.containsKey(type)) {
-                    nbt.put(type.getSerializedName(), DATA.get(type));
+                Tag data = DATA.get(type, player);
+                if (data != null) {
+                    nbt.put(type.getSerializedName(), data);
+                    DATA.remove(type, player);
                 }
             }
             sendPacket(player, new HudDataPayload(HudDataPayloadType.PACKET_S2C_DATA_LOGGER_TICK, nbt));
         }
     }
 
+    public void applyData(DataLogger.Type type, ServerPlayer player, Tag tag) {
+        DATA.put(type, player, tag);
+    }
+
     @Override
     public boolean isActive() {
         return fun.bm.lophine.config.modules.misc.SurvuxProtocolConfig.hudMetadataProtocol;

lophine-server/src/main/java/org/leavesmc/leaves/protocol/servux/litematics/ServuxLitematicsProtocol.java

@@ -146,35 +146,49 @@ public class ServuxLitematicsProtocol implements LeavesProtocol {
         if (!hasPermission(player)) {
             return;
         }
-        BlockEntity be = player.level().getBlockEntity(pos);
-        CompoundTag tag = be != null ? be.saveWithFullMetadata(MinecraftServer.getServer().registryAccess()) : new CompoundTag();
-        ServuxLitematicaPayload payload = new ServuxLitematicaPayload(ServuxLitematicaPayloadType.PACKET_S2C_BLOCK_NBT_RESPONSE_SIMPLE);
-        payload.pos = pos;
-        payload.nbt = tag;
-        encodeServerData(player, payload);
+        io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(
+                player.level(),
+                ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(player.position()),
+                ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkZ(player.position()),
+                () -> {
+                    BlockEntity be = player.level().getBlockEntity(pos);
+                    CompoundTag tag = be != null ? be.saveWithFullMetadata(MinecraftServer.getServer().registryAccess()) : new CompoundTag();
+                    ServuxLitematicaPayload payload = new ServuxLitematicaPayload(ServuxLitematicaPayloadType.PACKET_S2C_BLOCK_NBT_RESPONSE_SIMPLE);
+                    payload.pos = pos;
+                    payload.nbt = tag;
+                    encodeServerData(player, payload);
+                }
+        );
     }
 
     public static void onEntityRequest(ServerPlayer player, int entityId) {
         if (!hasPermission(player)) {
             return;
         }
-        Entity entity = player.level().getEntity(entityId);
-        if (entity == null) {
-            return;
-        }
-        CompoundTag tag = new CompoundTag();
-        ServuxLitematicaPayload payload = new ServuxLitematicaPayload(ServuxLitematicaPayloadType.PACKET_S2C_ENTITY_NBT_RESPONSE_SIMPLE);
-        payload.entityId = entityId;
-        if (entity instanceof net.minecraft.world.entity.player.Player) {
-            ResourceLocation loc = EntityType.getKey(entity.getType());
-            tag = TagUtil.saveEntity(entity);
-            tag.putString("id", loc.toString());
-            payload.nbt = tag;
-            encodeServerData(player, payload);
-        } else if (TagUtil.saveEntityAsPassenger(entity, tag)) {
-            payload.nbt = tag;
-            encodeServerData(player, payload);
-        }
+        io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(
+                player.level(),
+                ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(player.position()),
+                ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkZ(player.position()),
+                () -> {
+                    Entity entity = player.level().getEntity(entityId);
+                    if (entity == null) {
+                        return;
+                    }
+                    CompoundTag tag = new CompoundTag();
+                    ServuxLitematicaPayload payload = new ServuxLitematicaPayload(ServuxLitematicaPayloadType.PACKET_S2C_ENTITY_NBT_RESPONSE_SIMPLE);
+                    payload.entityId = entityId;
+                    if (entity instanceof net.minecraft.world.entity.player.Player) {
+                        ResourceLocation loc = EntityType.getKey(entity.getType());
+                        tag = TagUtil.saveEntity(entity);
+                        tag.putString("id", loc.toString());
+                        payload.nbt = tag;
+                        encodeServerData(player, payload);
+                    } else if (TagUtil.saveEntityAsPassenger(entity, tag)) {
+                        payload.nbt = tag;
+                        encodeServerData(player, payload);
+                    }
+                }
+        );
     }
 
     public static void onBulkEntityRequest(ServerPlayer player, ChunkPos chunkPos, CompoundTag req) {

lophine-server/src/main/java/org/leavesmc/leaves/protocol/servux/logger/DataLogger.java

@@ -19,6 +19,7 @@ package org.leavesmc.leaves.protocol.servux.logger;
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.serialization.Codec;
+import io.papermc.paper.threadedregions.TickRegionScheduler;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
@@ -26,11 +27,13 @@ import net.minecraft.nbt.Tag;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.ServerTickRateManager;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.StringRepresentable;
 import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.level.NaturalSpawner;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.leavesmc.leaves.protocol.servux.ServuxHudDataProtocol;
 import org.leavesmc.leaves.protocol.servux.logger.data.MobCapData;
 import org.leavesmc.leaves.protocol.servux.logger.data.TickData;
 
@@ -49,7 +52,7 @@ public abstract class DataLogger<T extends Tag> {
         return this.type;
     }
 
-    public abstract T getResult(MinecraftServer server);
+    public abstract T getResult(MinecraftServer server, ServuxHudDataProtocol protocol, ServerPlayer player);
 
     public enum Type implements StringRepresentable {
         TPS("tps", Tps::new, Tps.CODEC),
@@ -105,31 +108,36 @@ public abstract class DataLogger<T extends Tag> {
         }
 
         @Override
-        public CompoundTag getResult(MinecraftServer server) {
-            try {
-                return (CompoundTag) TickData.CODEC.encodeStart(server.registryAccess().createSerializationContext(NbtOps.INSTANCE), this.build(server)).getOrThrow();
-            } catch (Exception e) {
-                return new CompoundTag();
-            }
+        public CompoundTag getResult(MinecraftServer server, ServuxHudDataProtocol protocol, ServerPlayer player) {
+            this.build(server, protocol, player);
+            return null;
         }
 
-        private TickData build(MinecraftServer server) {
-            ServerTickRateManager tickManager = server.tickRateManager();
-            boolean frozen = tickManager.isFrozen();
-            boolean sprinting = tickManager.isSprinting();
-            final double mspt = server.tickTimes5s.getAverage();
-            double tps = 1000.0D / Math.max(sprinting ? 0.0 : tickManager.millisecondsPerTick(), mspt);
+        private TickData build(MinecraftServer server, ServuxHudDataProtocol protocol, ServerPlayer player) {
+            io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(
+                    player.level(),
+                    ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(player.position()),
+                    ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkZ(player.position()),
+                    () -> {
+                        ServerTickRateManager tickManager = server.tickRateManager();
+                        boolean frozen = tickManager.isFrozen();
+                        boolean sprinting = tickManager.isSprinting();
+                        io.papermc.paper.threadedregions.TickData.TickReportData tickData = TickRegionScheduler.getCurrentRegion().getData().getRegionSchedulingHandle().getTickReport5s(System.nanoTime());
+                        final double tps = tickData.tpsData().segmentAll().average();
+                        final double mspt = tickData.timePerTickData().segmentAll().average() / 1.0E6;
 
-            if (frozen) {
-                tps = 0.0d;
-            }
-
-            return new TickData(
-                    mspt, tps,
-                    tickManager.getRemainingSprintTicks(),
-                    frozen, sprinting,
-                    tickManager.isSteppingForward()
+                        TickData tk = new TickData(
+                                mspt, tps,
+                                tickManager.getRemainingSprintTicks(),
+                                frozen, sprinting,
+                                tickManager.isSteppingForward()
+                        );
+                        Tag ret = TickData.CODEC.encodeStart(server.registryAccess().createSerializationContext(NbtOps.INSTANCE), tk).getOrThrow();
+                        protocol.applyData(Type.TPS, player, ret);
+                    }
             );
+
+            return null;
         }
     }
 
@@ -142,7 +150,7 @@ public abstract class DataLogger<T extends Tag> {
         }
 
         @Override
-        public CompoundTag getResult(MinecraftServer server) {
+        public CompoundTag getResult(MinecraftServer server, ServuxHudDataProtocol protocol, ServerPlayer player) {
             CompoundTag nbt = new CompoundTag();
 
             for (ServerLevel world : server.getAllLevels()) {