Removed paper hopper optimizations

[ci skip] Update readme
Tidy codes
2025-02-06 23:19:17 +08:00 · 2025-02-05 16:39:22 +08:00 · 2025-02-05 16:12:51 +08:00 · 2025-02-05 15:30:33 +08:00 · 2025-02-04 12:01:21 +08:00 · 2025-02-03 11:57:57 +08:00
48 changed files with 1686 additions and 214 deletions
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@
 要构建一个paperclip jar，你需要运行以下命令。你可以在build/libs中找到jar（注意：需要`JDK21`）

 ```shell
- ./gradlew applyPatches && ./gradlew createMojmapPaperclipJar
+ ./gradlew applyAllPatches && ./gradlew createMojmapPaperclipJar
 ```

 ## 使用API
@@ -64,7 +64,7 @@ dependencies {
 ## 联系方式
 > 如果您对这个项目感兴趣或有任何问题，请随时向我们提问。

-**QQ群: [368632360](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=MfosKhcDd8Fdxn1MREuZ8Krbf9T6jiBC&authKey=3cm6qdHohON3gHnuD63FK4k07fIbrWnY4hdyq8OmELsfjMVP1kbFTJY9mRyM2Rkj&noverify=0&group_code=368632360)** | QQ频道: [点击加入](https://pd.qq.com/s/eq9krf9j) | Telegram: [点击加入](https://t.me/LuminolMC) | Discord: [点击加入](https://discord.gg/Qd7m3V6eDx)
+**QQ群: [1015048616](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=QML5kIVsniPi1PlZvnjHQT_02EHsZ5Jc&authKey=%2FTCJsZC7JFQ9sxAroPCKuYnlV57Z5fyqp36ewXZk3Sn4iJ9p4MB1JKdc%2FFcX3HOM&noverify=0&group_code=1015048616)** | QQ频道: [点击加入](https://pd.qq.com/s/eq9krf9j) | Telegram: [点击加入](https://t.me/LuminolMinecraft) | Discord: [点击加入](https://discord.gg/Qd7m3V6eDx)


 ## 关于 Issue
--- a/README_EN.md
+++ b/README_EN.md
@@ -25,7 +25,7 @@ Any versions are available in the [release](https://github.com/LuminolMC/Luminol
 To build a paperclip jar, you need to run the following command. You can find the jar in build/libs(Note: JDK21 is needed)

 ```shell
- ./gradlew applyPatches && ./gradlew createMojmapPaperclipJar
+ ./gradlew applyAllPatches && ./gradlew createMojmapPaperclipJar
 ```

 ## Using API
@@ -65,7 +65,7 @@ For maven
 ## Contact
 > If you are interested in this project or have any issue, feel free to ask us.

-**QQ Group: [368632360](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=MfosKhcDd8Fdxn1MREuZ8Krbf9T6jiBC&authKey=3cm6qdHohON3gHnuD63FK4k07fIbrWnY4hdyq8OmELsfjMVP1kbFTJY9mRyM2Rkj&noverify=0&group_code=368632360)** | QQ Channel: [Click To Join](https://pd.qq.com/s/eq9krf9j) | Telegram: [Click To Join](https://t.me/LuminolMC) | Discord: [Click To Join](https://discord.gg/Qd7m3V6eDx)
+**QQ Group: [1015048616](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=hTPlI5j6XB8pgk4sdx6RkjhBPGG1r4IR&authKey=pnu6uCKQP7Sja2CJWC15Qi3BeI%2FAsh8tU4m5muufMBjbB3zz%2BwHBZCTRRdSNKhld&noverify=0&group_code=1015048616)** | QQ Channel: [Click To Join](https://pd.qq.com/s/eq9krf9j) | Telegram: [Click To Join](https://t.me/LuminolMinecraft) | Discord: [Click To Join](https://discord.gg/Qd7m3V6eDx)

 ## About Issue
 When you meet any problems, just ask us, we will do our best to solve it, but remember to state your problem clear and provide enough logs etc.</br>
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = me.earthme.luminol
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4

-foliaRef=873afea9394264ac3a6788075f773bcb9ea95635
+foliaRef=3af04d9c6a98d24032bf8c99ad5446b0f381e320

 org.gradle.configuration-cache=true
 org.gradle.caching=true
--- a/luminol-api/paper-patches/features/0009-Add-missing-teleportation-apis-for-folia.patch
+++ b/luminol-api/paper-patches/features/0009-Add-missing-teleportation-apis-for-folia.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add missing teleportation apis for folia

 diff --git a/src/main/java/me/earthme/luminol/api/entity/EntityTeleportAsyncEvent.java b/src/main/java/me/earthme/luminol/api/entity/EntityTeleportAsyncEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..0c218c99073e4d20532f81c5ab467fbf3e7a57e8
+index 0000000000000000000000000000000000000000..a31c803831dad3d31386924cbe27deff59855fc9
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/api/entity/EntityTeleportAsyncEvent.java
-@@ -0,0 +1,75 @@
+@@ -0,0 +1,68 @@
 +package me.earthme.luminol.api.entity;
 +
 +import org.apache.commons.lang3.Validate;
@@ -27,11 +27,9 @@ index 0000000000000000000000000000000000000000..0c218c99073e4d20532f81c5ab467fbf
 + * @see org.bukkit.entity.Entity#teleportAsync(org.bukkit.Location)
 + * (Also fired when teleportAsync called from nms)
 + */
-+public class EntityTeleportAsyncEvent extends Event implements Cancellable {
+public class EntityTeleportAsyncEvent extends Event {
 +    private static final HandlerList HANDLERS = new HandlerList();
 +
-+    private boolean cancelled = false;
-+
 +    private final Entity entity;
 +    private final PlayerTeleportEvent.TeleportCause teleportCause;
 +    private final Location destination;
@@ -75,22 +73,17 @@ index 0000000000000000000000000000000000000000..0c218c99073e4d20532f81c5ab467fbf
 +        return HANDLERS;
 +    }
 +
-+    @Override
-+    public boolean isCancelled() {
-+        return this.cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
 +    }
 +}
 diff --git a/src/main/java/me/earthme/luminol/api/entity/PostEntityPortalEvent.java b/src/main/java/me/earthme/luminol/api/entity/PostEntityPortalEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..50b601d124bbaf4eedb626d84ed6dae9ab6e9ef1
+index 0000000000000000000000000000000000000000..dd3087b407ccf4e96448701e6fbf75705498f982
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/api/entity/PostEntityPortalEvent.java
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,41 @@
 +package me.earthme.luminol.api.entity;
 +
 +import org.apache.commons.lang3.Validate;
@@ -126,13 +119,18 @@ index 0000000000000000000000000000000000000000..50b601d124bbaf4eedb626d84ed6dae9
 +    public @NotNull HandlerList getHandlers() {
 +        return HANDLER_LIST;
 +    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
 +}
 diff --git a/src/main/java/me/earthme/luminol/api/entity/PreEntityPortalEvent.java b/src/main/java/me/earthme/luminol/api/entity/PreEntityPortalEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..e25146f3b5d296ecd21e62ed97f574f6a3a4af1d
+index 0000000000000000000000000000000000000000..fc844429e3ecfe2529c0a49b8a5d958eeb188ad9
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/api/entity/PreEntityPortalEvent.java
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,78 @@
 +package me.earthme.luminol.api.entity;
 +
 +import org.apache.commons.lang3.Validate;
@@ -205,13 +203,18 @@ index 0000000000000000000000000000000000000000..e25146f3b5d296ecd21e62ed97f574f6
 +    public @NotNull HandlerList getHandlers() {
 +        return HANDLERS;
 +    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
 +}
 diff --git a/src/main/java/me/earthme/luminol/api/entity/player/PostPlayerRespawnEvent.java b/src/main/java/me/earthme/luminol/api/entity/player/PostPlayerRespawnEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..bf4469593b22f3e5cff89953819e7fdde252abf5
+index 0000000000000000000000000000000000000000..9a561455560dfeee1d8762297ebf15a7c11de4d1
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/api/entity/player/PostPlayerRespawnEvent.java
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,40 @@
 +package me.earthme.luminol.api.entity.player;
 +
 +import org.apache.commons.lang3.Validate;
@@ -246,13 +249,18 @@ index 0000000000000000000000000000000000000000..bf4469593b22f3e5cff89953819e7fdd
 +    public @NotNull HandlerList getHandlers() {
 +        return HANDLERS;
 +    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
 +}
 diff --git a/src/main/java/me/earthme/luminol/api/portal/EndPlatformCreateEvent.java b/src/main/java/me/earthme/luminol/api/portal/EndPlatformCreateEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..12b2bef2f66f22bb56c10434cc08b39cef335447
+index 0000000000000000000000000000000000000000..cf87a7cce5d1ebec9709b762595609344807150b
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/api/portal/EndPlatformCreateEvent.java
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,35 @@
 +package me.earthme.luminol.api.portal;
 +
 +import org.bukkit.event.Cancellable;
@@ -282,13 +290,18 @@ index 0000000000000000000000000000000000000000..12b2bef2f66f22bb56c10434cc08b39c
 +    public @NotNull HandlerList getHandlers() {
 +        return HANDLERS;
 +    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
 +}
 diff --git a/src/main/java/me/earthme/luminol/api/portal/PortalLocateEvent.java b/src/main/java/me/earthme/luminol/api/portal/PortalLocateEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f68bf95bba671f3cf90d9878d93dd319bdf9db40
+index 0000000000000000000000000000000000000000..e09ffb99aad6f6acca3d6a411877715b90413eb0
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/api/portal/PortalLocateEvent.java
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,53 @@
 +package me.earthme.luminol.api.portal;
 +
 +import org.apache.commons.lang3.Validate;
@@ -299,12 +312,14 @@ index 0000000000000000000000000000000000000000..f68bf95bba671f3cf90d9878d93dd319
 +
 +/**
 + * A event fired when the portal process started locating the destination position
+ * Notice: If you changed the destination to an another position in end teleportation.The end platform won't create under the entity and won't create
+ * if the position is out of current tick region
 + */
 +public class PortalLocateEvent extends Event {
 +    private static final HandlerList HANDLERS = new HandlerList();
 +
 +    private final Location original;
-+    private Location destination;
+    private final Location destination;
 +
 +    public PortalLocateEvent(Location original, Location destination) {
 +        Validate.notNull(original, "original couldn't be null!");
@@ -323,17 +338,6 @@ index 0000000000000000000000000000000000000000..f68bf95bba671f3cf90d9878d93dd319
 +    }
 +
 +    /**
-+     * Set the destination position of this teleportation
-+     * @param destination the destination position
-+     */
-+    public void setDestination(@NotNull Location destination) {
-+        Validate.notNull(destination, "Destination position couldn't be null!");
-+        Validate.isTrue(destination.getWorld().equals(this.destination.getWorld()), "Destination position couldn't be a different level!");
-+
-+        this.destination = destination;
-+    }
-+
-+    /**
 +     * Get the original portal position of this teleportation
 +     * @return the original portal position
 +     */
@@ -345,4 +349,9 @@ index 0000000000000000000000000000000000000000..f68bf95bba671f3cf90d9878d93dd319
 +    public @NotNull HandlerList getHandlers() {
 +        return HANDLERS;
 +    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
 +}
--- a/luminol-server/minecraft-patches/features/0020-Merge-Paper-11945-for-temporary-hopper-behavior-fix.patch
+++ b/luminol-server/minecraft-patches/features/0020-Merge-Paper-11945-for-temporary-hopper-behavior-fix.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
-Date: Sun, 12 Jan 2025 11:03:09 +0800
-Subject: [PATCH] Merge Paper #11945 for temporary hopper behavior fix
-
-A hopper optimization fix on Paper's pr : https://github.com/PaperMC/Paper/pull/11945
-
-diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index ae988c4910421fb720177178ef6136e595ae6946..72a81e29be6570fb119b159210453a86f003f893 100644
--- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-+++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-@@ -698,6 +698,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
-             } else if (canMergeItems(item, stack)) {
-                 int i = Math.min(stack.getMaxStackSize(), destination.getMaxStackSize()) - item.getCount(); // Paper - Make hoppers respect inventory max stack size
-                 int min = Math.min(stack.getCount(), i);
-+                stack = stack.copy(true); // Luminol
-                 stack.shrink(min);
-                 item.grow(min);
-                 flag = min > 0;
--- a/luminol-server/minecraft-patches/features/0020-Skip-collision-check-if-the-block-is-not-belong-to-c.patch
+++ b/luminol-server/minecraft-patches/features/0020-Skip-collision-check-if-the-block-is-not-belong-to-c.patch
@@ -5,7 +5,6 @@ Subject: [PATCH] Skip collision check if the block is not belong to current
 tick region

 A temporary fix of these issues:
-https://github.com/PaperMC/Folia/issues/324
 https://github.com/PaperMC/Folia/issues/311

 Due to that mojang won't ignore the blocks the entity passed by, and sometimes the old position may not be updated and it points to a block that we don't own it, and it will access it during applyEffectsFromBlocks.So the best way to fix that is to skip the collision check of that block because it was already not owned by us and it's not necessary to check it
@@ -14,7 +13,7 @@ Related to mojang's bug fix:
 https://bugs.mojang.com/browse/MC-92875

 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 1868cb351d030d1997b5c81a184657085261c2f3..215462da04ca040e25d3cbfcbdbedfbca14e8224 100644
+index aa4337942b4b9b7dd746b9b9c5a052d626b1e72c..61814607a6c8e4ce8d07645f005ea8d53f624c95 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -1675,6 +1675,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
--- a/luminol-server/minecraft-patches/features/0021-Removed-paper-hopper-optimizations.patch
+++ b/luminol-server/minecraft-patches/features/0021-Removed-paper-hopper-optimizations.patch
@@ -0,0 +1,280 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <wangxyper@163.com>
+Date: Thu, 6 Feb 2025 23:15:04 +0800
+Subject: [PATCH] Removed paper hopper optimizations
+
+
+diff --git a/net/minecraft/world/level/block/entity/BlockEntity.java b/net/minecraft/world/level/block/entity/BlockEntity.java
+index 003e9db957023486278679803b313ce89d573587..2ce2f94e53a8e9cb4240ab1102b30b4fa07c92dc 100644
+--- a/net/minecraft/world/level/block/entity/BlockEntity.java
+++ b/net/minecraft/world/level/block/entity/BlockEntity.java
+@@ -203,7 +203,7 @@ public abstract class BlockEntity {
+ 
+     public void setChanged() {
+         if (this.level != null) {
+-            if (IGNORE_TILE_UPDATES.get().booleanValue()) return; // Paper - Perf: Optimize Hoppers // Folia - region threading
+            //if (IGNORE_TILE_UPDATES.get().booleanValue()) return; // Paper - Perf: Optimize Hoppers // Folia - region threading // Luminol - Disable paper hooper optimizations
+             setChanged(this.level, this.worldPosition, this.blockState);
+         }
+     }
+diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+index ae988c4910421fb720177178ef6136e595ae6946..17c1bf710e6cb2ac0a6f41b6ec85e98e253d25e5 100644
+--- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+@@ -298,9 +298,9 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+                 origItemStack.setCount(originalItemCount - movedItemCount + remainingItemCount);
+             }
+ 
+-            IGNORE_TILE_UPDATES.set(true); // Folia - region threading
+            //IGNORE_TILE_UPDATES.set(true); // Folia - region threading // Luminol - Disable paper hooper optimizations
+             container.setItem(i, origItemStack);
+-            IGNORE_TILE_UPDATES.set(false); // Folia - region threading
+            //IGNORE_TILE_UPDATES.set(false); // Folia - region threading // Luminol - Disable paper hooper optimizations
+             container.setChanged();
+             return true;
+         }
+@@ -433,58 +433,60 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+                 return false;
+             } else {
+                 // Paper start - Perf: Optimize Hoppers
+-                return hopperPush(level, attachedContainer, opposite, blockEntity);
+-                //for (int i = 0; i < blockEntity.getContainerSize(); i++) {
+-                //    ItemStack item = blockEntity.getItem(i);
+-                //    if (!item.isEmpty()) {
+-                //        int count = item.getCount();
+-                //        // CraftBukkit start - Call event when pushing items into other inventories
+-                //        ItemStack original = item.copy();
+-                //        org.bukkit.craftbukkit.inventory.CraftItemStack oitemstack = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(
+-                //            blockEntity.removeItem(i, level.spigotConfig.hopperAmount)
+-                //        ); // Spigot
+-
+-                //        org.bukkit.inventory.Inventory destinationInventory;
+-                //        // Have to special case large chests as they work oddly
+-                //        if (attachedContainer instanceof final net.minecraft.world.CompoundContainer compoundContainer) {
+-                //            destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest(compoundContainer);
+-                //        } else if (attachedContainer.getOwner() != null) {
+-                //            destinationInventory = attachedContainer.getOwner().getInventory();
+-                //        } else {
+-                //            destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventory(attachedContainer);
+-                //        }
+-
+-                //        org.bukkit.event.inventory.InventoryMoveItemEvent event = new org.bukkit.event.inventory.InventoryMoveItemEvent(
+-                //            blockEntity.getOwner().getInventory(),
+-                //            oitemstack,
+-                //            destinationInventory,
+-                //            true
+-                //        );
+-                //        if (!event.callEvent()) {
+-                //            blockEntity.setItem(i, original);
+-                //            blockEntity.setCooldown(level.spigotConfig.hopperTransfer); // Delay hopper checks // Spigot
+-                //            return false;
+-                //        }
+-                //        int origCount = event.getItem().getAmount(); // Spigot
+-                //        ItemStack itemStack = HopperBlockEntity.addItem(blockEntity, attachedContainer, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getItem()), opposite);
+-                //        // CraftBukkit end
+-
+-                //        if (itemStack.isEmpty()) {
+-                //            attachedContainer.setChanged();
+-                //            return true;
+-                //        }
+-
+-                //        item.setCount(count);
+-                //        // Spigot start
+-                //        item.shrink(origCount - itemStack.getCount());
+-                //        if (count <= level.spigotConfig.hopperAmount) {
+-                //            // Spigot end
+-                //            blockEntity.setItem(i, item);
+-                //        }
+-                //    }
+-                //}
+-
+-                //return false;
+                //return hopperPush(level, attachedContainer, opposite, blockEntity); // Luminol - Disable paper hopper optimization
+                // Luminol start - Disable paper hopper optimization
+                for (int i = 0; i < blockEntity.getContainerSize(); i++) {
+                    ItemStack item = blockEntity.getItem(i);
+                    if (!item.isEmpty()) {
+                        int count = item.getCount();
+                        // CraftBukkit start - Call event when pushing items into other inventories
+                        ItemStack original = item.copy();
+                        org.bukkit.craftbukkit.inventory.CraftItemStack oitemstack = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(
+                            blockEntity.removeItem(i, level.spigotConfig.hopperAmount)
+                        ); // Spigot
+
+                        org.bukkit.inventory.Inventory destinationInventory;
+                        // Have to special case large chests as they work oddly
+                        if (attachedContainer instanceof final net.minecraft.world.CompoundContainer compoundContainer) {
+                            destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest(compoundContainer);
+                        } else if (attachedContainer.getOwner() != null) {
+                            destinationInventory = attachedContainer.getOwner().getInventory();
+                        } else {
+                            destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventory(attachedContainer);
+                        }
+
+                        org.bukkit.event.inventory.InventoryMoveItemEvent event = new org.bukkit.event.inventory.InventoryMoveItemEvent(
+                            blockEntity.getOwner().getInventory(),
+                            oitemstack,
+                            destinationInventory,
+                            true
+                        );
+                        if (!event.callEvent()) {
+                            blockEntity.setItem(i, original);
+                            blockEntity.setCooldown(level.spigotConfig.hopperTransfer); // Delay hopper checks // Spigot
+                            return false;
+                        }
+                        int origCount = event.getItem().getAmount(); // Spigot
+                        ItemStack itemStack = HopperBlockEntity.addItem(blockEntity, attachedContainer, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getItem()), opposite);
+                        // CraftBukkit end
+
+                        if (itemStack.isEmpty()) {
+                            attachedContainer.setChanged();
+                            return true;
+                        }
+
+                        item.setCount(count);
+                        // Spigot start
+                        item.shrink(origCount - itemStack.getCount());
+                        if (count <= level.spigotConfig.hopperAmount) {
+                            // Spigot end
+                            blockEntity.setItem(i, item);
+                        }
+                    }
+                }
+
+                return false;
+                // Luminol end
+                 // Paper end - Perf: Optimize Hoppers
+             }
+         }
+@@ -568,57 +570,59 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+         ItemStack item = container.getItem(slot);
+         if (!item.isEmpty() && canTakeItemFromContainer(hopper, container, item, slot, direction)) {
+             // Paper start - Perf: Optimize Hoppers
+-            return hopperPull(level, hopper, container, item, slot);
+-            //int count = item.getCount();
+-            //// CraftBukkit start - Call event on collection of items from inventories into the hopper
+-            //ItemStack original = item.copy();
+-            //org.bukkit.craftbukkit.inventory.CraftItemStack oitemstack = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(
+-            //    container.removeItem(slot, level.spigotConfig.hopperAmount) // Spigot
+-            //);
+-
+-            //org.bukkit.inventory.Inventory sourceInventory;
+-            //// Have to special case large chests as they work oddly
+-            //if (container instanceof final net.minecraft.world.CompoundContainer compoundContainer) {
+-            //    sourceInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest(compoundContainer);
+-            //} else if (container.getOwner() != null) {
+-            //    sourceInventory = container.getOwner().getInventory();
+-            //} else {
+-            //    sourceInventory = new org.bukkit.craftbukkit.inventory.CraftInventory(container);
+-            //}
+-
+-            //org.bukkit.event.inventory.InventoryMoveItemEvent event = new org.bukkit.event.inventory.InventoryMoveItemEvent(
+-            //    sourceInventory,
+-            //    oitemstack,
+-            //    hopper.getOwner().getInventory(),
+-            //    false
+-            //);
+-
+-            //if (!event.callEvent()) {
+-            //    container.setItem(slot, original);
+-
+-            //    if (hopper instanceof final HopperBlockEntity hopperBlockEntity) {
+-            //        hopperBlockEntity.setCooldown(level.spigotConfig.hopperTransfer); // Spigot
+-            //    }
+-
+-            //    return false;
+-            //}
+-            //int origCount = event.getItem().getAmount(); // Spigot
+-            //ItemStack itemStack = HopperBlockEntity.addItem(container, hopper, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getItem()), null);
+-            //// CraftBukkit end
+-
+-            //if (itemStack.isEmpty()) {
+-            //    container.setChanged();
+-            //    return true;
+-            //}
+-
+-            //item.setCount(count);
+-            //// Spigot start
+-            //item.shrink(origCount - itemStack.getCount());
+-            //if (count <= level.spigotConfig.hopperAmount) {
+-            //    // Spigot end
+-            //    container.setItem(slot, item);
+-            //}
+-            // Paper end - Perf: Optimize Hoppers
+            //return hopperPull(level, hopper, container, item, slot); // Luminol - Disable paper hooper optimizations
+            // Luminol start - Disable paper hooper optimizations
+            int count = item.getCount();
+            // CraftBukkit start - Call event on collection of items from inventories into the hopper
+            ItemStack original = item.copy();
+            org.bukkit.craftbukkit.inventory.CraftItemStack oitemstack = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(
+                container.removeItem(slot, level.spigotConfig.hopperAmount) // Spigot
+            );
+
+            org.bukkit.inventory.Inventory sourceInventory;
+            // Have to special case large chests as they work oddly
+            if (container instanceof final net.minecraft.world.CompoundContainer compoundContainer) {
+                sourceInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest(compoundContainer);
+            } else if (container.getOwner() != null) {
+                sourceInventory = container.getOwner().getInventory();
+            } else {
+                sourceInventory = new org.bukkit.craftbukkit.inventory.CraftInventory(container);
+            }
+
+            org.bukkit.event.inventory.InventoryMoveItemEvent event = new org.bukkit.event.inventory.InventoryMoveItemEvent(
+                sourceInventory,
+                oitemstack,
+                hopper.getOwner().getInventory(),
+                false
+            );
+
+            if (!event.callEvent()) {
+                container.setItem(slot, original);
+
+                if (hopper instanceof final HopperBlockEntity hopperBlockEntity) {
+                    hopperBlockEntity.setCooldown(level.spigotConfig.hopperTransfer); // Spigot
+                }
+
+                return false;
+            }
+            int origCount = event.getItem().getAmount(); // Spigot
+            ItemStack itemStack = HopperBlockEntity.addItem(container, hopper, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getItem()), null);
+            // CraftBukkit end
+
+            if (itemStack.isEmpty()) {
+                container.setChanged();
+                return true;
+            }
+
+            item.setCount(count);
+            // Spigot start
+            item.shrink(origCount - itemStack.getCount());
+            if (count <= level.spigotConfig.hopperAmount) {
+                // Spigot end
+                container.setItem(slot, item);
+            }
+            // Luminol end
+            //Paper end - Perf: Optimize Hoppers
+         }
+ 
+         return false;
+@@ -690,9 +694,9 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+                     stack = stack.split(destination.getMaxStackSize());
+                 }
+                 // Spigot end
+-                IGNORE_TILE_UPDATES.set(Boolean.TRUE); // Paper - Perf: Optimize Hoppers // Folia - region threading
+                //IGNORE_TILE_UPDATES.set(Boolean.TRUE); // Paper - Perf: Optimize Hoppers // Folia - region threading // Luminol - Disable paper hooper optimizations
+                 destination.setItem(slot, stack);
+-                IGNORE_TILE_UPDATES.set(Boolean.FALSE); // Paper - Perf: Optimize Hoppers // Folia - region threading
+                //IGNORE_TILE_UPDATES.set(Boolean.FALSE); // Paper - Perf: Optimize Hoppers // Folia - region threading // Luminol - Disable paper hooper optimizations
+                 stack = leftover; // Paper - Make hoppers respect inventory max stack size
+                 flag = true;
+             } else if (canMergeItems(item, stack)) {
+@@ -780,7 +784,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+ 
+     @Nullable
+     public static Container getContainerAt(Level level, BlockPos pos) {
+-        return getContainerAt(level, pos, level.getBlockState(pos), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, true); // Paper - Optimize hoppers
+        return getContainerAt(level, pos, level.getBlockState(pos), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, false); // Paper - Optimize hoppers // Luminol - Disable paper hooper optimizations
+     }
+ 
+     @Nullable
--- a/luminol-server/minecraft-patches/features/0022-Kaiiju-Don-t-pathfind-outside-region.patch
+++ b/luminol-server/minecraft-patches/features/0022-Kaiiju-Don-t-pathfind-outside-region.patch
--- a/luminol-server/minecraft-patches/features/0022-Merge-paper-12047.patch
+++ b/luminol-server/minecraft-patches/features/0022-Merge-paper-12047.patch
@@ -1,87 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
-Date: Fri, 31 Jan 2025 12:54:45 +0800
-Subject: [PATCH] Merge paper #12047
-
-
-diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java
-index ba8b5a0ebe652bfaf5c1498c19d12a91a192bf8e..8b661a11ed798186335b4ea6b907eb719cbbf722 100644
--- a/io/papermc/paper/entity/activation/ActivationRange.java
-+++ b/io/papermc/paper/entity/activation/ActivationRange.java
-@@ -40,10 +40,10 @@ public final class ActivationRange {
-     }
- 
-     static Activity[] VILLAGER_PANIC_IMMUNITIES = {
-        Activity.HIDE,
-        Activity.PRE_RAID,
-        Activity.RAID,
-        Activity.PANIC
-+            Activity.HIDE,
-+            Activity.PRE_RAID,
-+            Activity.RAID,
-+            Activity.PANIC
-     };
- 
-     private static int checkInactiveWakeup(final Entity entity) {
-@@ -85,28 +85,28 @@ public final class ActivationRange {
-      * @return boolean If it should always tick.
-      */
-     public static boolean initializeEntityActivationState(final Entity entity, final SpigotWorldConfig config) {
-        return (entity.activationType == ActivationType.MISC && config.miscActivationRange == 0)
-            || (entity.activationType == ActivationType.RAIDER && config.raiderActivationRange == 0)
-            || (entity.activationType == ActivationType.ANIMAL && config.animalActivationRange == 0)
-            || (entity.activationType == ActivationType.MONSTER && config.monsterActivationRange == 0)
-            || (entity.activationType == ActivationType.VILLAGER && config.villagerActivationRange <= 0)
-            || (entity.activationType == ActivationType.WATER && config.waterActivationRange <= 0)
-            || (entity.activationType == ActivationType.FLYING_MONSTER && config.flyingMonsterActivationRange <= 0)
-            || entity instanceof EyeOfEnder
-            || entity instanceof Player
-            || entity instanceof ThrowableProjectile
-            || entity instanceof EnderDragon
-            || entity instanceof EnderDragonPart
-            || entity instanceof WitherBoss
-            || entity instanceof AbstractHurtingProjectile
-            || entity instanceof LightningBolt
-            || entity instanceof PrimedTnt
-            || entity instanceof net.minecraft.world.entity.item.FallingBlockEntity
-            || entity instanceof net.minecraft.world.entity.vehicle.AbstractMinecart
-            || entity instanceof net.minecraft.world.entity.vehicle.AbstractBoat
-            || entity instanceof EndCrystal
-            || entity instanceof FireworkRocketEntity
-            || entity instanceof ThrownTrident;
-+        return (entity.activationType == ActivationType.MISC && config.miscActivationRange <= 0) // Luminol - Merge paper #12047
-+                || (entity.activationType == ActivationType.RAIDER && config.raiderActivationRange <= 0) // Luminol - Merge paper #12047
-+                || (entity.activationType == ActivationType.ANIMAL && config.animalActivationRange <= 0) // Luminol - Merge paper #12047
-+                || (entity.activationType == ActivationType.MONSTER && config.monsterActivationRange <= 0) // Luminol - Merge paper #12047
-+                || (entity.activationType == ActivationType.VILLAGER && config.villagerActivationRange <= 0)
-+                || (entity.activationType == ActivationType.WATER && config.waterActivationRange <= 0)
-+                || (entity.activationType == ActivationType.FLYING_MONSTER && config.flyingMonsterActivationRange <= 0)
-+                || entity instanceof EyeOfEnder
-+                || entity instanceof Player
-+                || entity instanceof ThrowableProjectile
-+                || entity instanceof EnderDragon
-+                || entity instanceof EnderDragonPart
-+                || entity instanceof WitherBoss
-+                || entity instanceof AbstractHurtingProjectile
-+                || entity instanceof LightningBolt
-+                || entity instanceof PrimedTnt
-+                || entity instanceof net.minecraft.world.entity.item.FallingBlockEntity
-+                || entity instanceof net.minecraft.world.entity.vehicle.AbstractMinecart
-+                || entity instanceof net.minecraft.world.entity.vehicle.AbstractBoat
-+                || entity instanceof EndCrystal
-+                || entity instanceof FireworkRocketEntity
-+                || entity instanceof ThrownTrident;
-     }
- 
-     /**
-@@ -234,8 +234,8 @@ public final class ActivationRange {
-             if (entity instanceof final Bee bee) {
-                 final BlockPos movingTarget = bee.getMovingTarget();
-                 if (bee.isAngry() ||
-                    (bee.getHivePos() != null && bee.getHivePos().equals(movingTarget)) ||
-                    (bee.getSavedFlowerPos() != null && bee.getSavedFlowerPos().equals(movingTarget))
-+                        (bee.getHivePos() != null && bee.getHivePos().equals(movingTarget)) ||
-+                        (bee.getSavedFlowerPos() != null && bee.getSavedFlowerPos().equals(movingTarget))
-                 ) {
-                     return 20;
-                 }
--- a/luminol-server/minecraft-patches/features/0023-Kaiiju-Vanilla-end-portal-teleportation.patch
+++ b/luminol-server/minecraft-patches/features/0023-Kaiiju-Vanilla-end-portal-teleportation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Kaiiju Vanilla end portal teleportation


 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 215462da04ca040e25d3cbfcbdbedfbca14e8224..8ce478d0c582e3c9c605b11a90271e95be5d0408 100644
+index 61814607a6c8e4ce8d07645f005ea8d53f624c95..5979893976ab8c59a17e306cd91c9a4f5cd3738e 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -110,6 +110,7 @@ import net.minecraft.world.level.block.Rotation;
@@ -16,7 +16,7 @@ index 215462da04ca040e25d3cbfcbdbedfbca14e8224..8ce478d0c582e3c9c605b11a90271e95
 import net.minecraft.world.level.entity.EntityAccess;
 import net.minecraft.world.level.entity.EntityInLevelCallback;
 import net.minecraft.world.level.gameevent.DynamicGameEventListener;
-@@ -4278,13 +4279,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4280,13 +4281,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                         targetPos, 16, // load 16 blocks to be safe from block physics
                         ca.spottedleaf.concurrentutil.util.Priority.HIGH,
                         (chunks) -> {
@@ -37,7 +37,7 @@ index 215462da04ca040e25d3cbfcbdbedfbca14e8224..8ce478d0c582e3c9c605b11a90271e95
                                     TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
                                     org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
                                 )
-@@ -4480,6 +4486,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4482,6 +4488,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
         if (!this.canPortalAsync(destination, takePassengers)) {
             return false;
         }
@@ -48,7 +48,7 @@ index 215462da04ca040e25d3cbfcbdbedfbca14e8224..8ce478d0c582e3c9c605b11a90271e95
 
         Vec3 initialPosition = this.position();
         ChunkPos initialPositionChunk = new ChunkPos(
-@@ -4544,9 +4554,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4546,9 +4556,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                         info.postTeleportTransition().onTransition(teleported);
                     }
 
--- a/luminol-server/minecraft-patches/features/0024-Kaiiju-Entity-tick-and-removal-limiter.patch
+++ b/luminol-server/minecraft-patches/features/0024-Kaiiju-Entity-tick-and-removal-limiter.patch
--- a/luminol-server/minecraft-patches/features/0025-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch
+++ b/luminol-server/minecraft-patches/features/0025-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch
@@ -159,10 +159,10 @@ index 23b342cc31c7e72ade0e1ccad86a9ccf34380f13..249cb7326c8e4012dcffdb6bbb7bfc1f
 +    // KioCG end
 }
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 8ce478d0c582e3c9c605b11a90271e95be5d0408..023b06e104e45ad7fb52e33b4ea785cd07ae0592 100644
+index 5979893976ab8c59a17e306cd91c9a4f5cd3738e..4f0ea00cd601c62926220400c8e3597815dc4d15 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -5965,4 +5965,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5967,4 +5967,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
         return ((ServerLevel) this.level).isPositionEntityTicking(this.blockPosition());
     }
     // Paper end - Expose entity id counter
--- a/luminol-server/minecraft-patches/features/0026-Purpur-Use-alternative-keep-alive.patch
+++ b/luminol-server/minecraft-patches/features/0026-Purpur-Use-alternative-keep-alive.patch
--- a/luminol-server/minecraft-patches/features/0027-Purpur-Lobotomize-stuck-villagers.patch
+++ b/luminol-server/minecraft-patches/features/0027-Purpur-Lobotomize-stuck-villagers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur Lobotomize stuck villagers


 diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
-index 7ea74aeb905b95e5919d74df5fbc5e8f7a9985e3..d6e337ac8cf3d40f60a20b07826a4eee1c865bc3 100644
+index 7ea74aeb905b95e5919d74df5fbc5e8f7a9985e3..b61da3d0d7d24b674cae155b95f7fab0669f4a20 100644
 --- a/net/minecraft/world/entity/npc/Villager.java
 +++ b/net/minecraft/world/entity/npc/Villager.java
@@ -193,6 +193,53 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -62,7 +62,7 @@ index 7ea74aeb905b95e5919d74df5fbc5e8f7a9985e3..d6e337ac8cf3d40f60a20b07826a4eee
     @Override
     public Brain<Villager> getBrain() {
         return (Brain<Villager>)super.getBrain();
-@@ -289,10 +336,18 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -289,11 +336,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
         // Paper start - EAR 2
         this.customServerAiStep(level, false);
     }
@@ -71,6 +71,7 @@ index 7ea74aeb905b95e5919d74df5fbc5e8f7a9985e3..d6e337ac8cf3d40f60a20b07826a4eee
         // Paper end - EAR 2
         ProfilerFiller profilerFiller = Profiler.get();
         profilerFiller.push("villagerBrain");
+-        if (!inactive) this.getBrain().tick(level, this); // Paper - EAR 2
 +        // Purpur start
 +        if (me.earthme.luminol.config.modules.optimizations.LobotomizeVillageConfig.villagerLobotomizeEnabled) {
 +            // treat as inactive if lobotomized
@@ -79,6 +80,9 @@ index 7ea74aeb905b95e5919d74df5fbc5e8f7a9985e3..d6e337ac8cf3d40f60a20b07826a4eee
 +            this.isLobotomized = false;
 +        }
 +        // Purpur end
-         if (!inactive) this.getBrain().tick(level, this); // Paper - EAR 2
+        if (!inactive) {
+            this.getBrain().tick(level, this); // Paper - EAR 2
+        } else if (this.isLobotomized && shouldRestock()) restock(); // Purpur - Lobotomize stuck villagers
         profilerFiller.pop();
         if (this.assignProfessionWhenSpawned) {
+             this.assignProfessionWhenSpawned = false;
--- a/luminol-server/minecraft-patches/features/0028-Petal-Reduce-sensor-work.patch
+++ b/luminol-server/minecraft-patches/features/0028-Petal-Reduce-sensor-work.patch
--- a/luminol-server/minecraft-patches/features/0029-Pufferfish-Cache-climbing-check-for-activation.patch
+++ b/luminol-server/minecraft-patches/features/0029-Pufferfish-Cache-climbing-check-for-activation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Pufferfish Cache climbing check for activation


 diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java
-index 8b661a11ed798186335b4ea6b907eb719cbbf722..956807b34d5fda666966d23d46a7ae4ec5055071 100644
+index c260741a87513b89a5cc62c543fb9f990f86491e..beb9b3b3cd5ca60bd2cdada937bff8a1da639da5 100644
 --- a/io/papermc/paper/entity/activation/ActivationRange.java
 +++ b/io/papermc/paper/entity/activation/ActivationRange.java
@@ -225,7 +225,7 @@ public final class ActivationRange {
--- a/luminol-server/minecraft-patches/features/0030-Pufferfish-Reduce-chunk-loading-lookups.patch
+++ b/luminol-server/minecraft-patches/features/0030-Pufferfish-Reduce-chunk-loading-lookups.patch
--- a/luminol-server/minecraft-patches/features/0031-Gale-Use-platform-math-functions.patch
+++ b/luminol-server/minecraft-patches/features/0031-Gale-Use-platform-math-functions.patch
--- a/luminol-server/minecraft-patches/features/0032-Gale-Variable-entity-wake-up-duration.patch
+++ b/luminol-server/minecraft-patches/features/0032-Gale-Variable-entity-wake-up-duration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Variable entity wake-up duration


 diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java
-index 956807b34d5fda666966d23d46a7ae4ec5055071..3a1c4f9f44026dcff7f4a32bb3ceaf79963389ed 100644
+index beb9b3b3cd5ca60bd2cdada937bff8a1da639da5..3c9fc433155dd235668ded700d51d95434ba745f 100644
 --- a/io/papermc/paper/entity/activation/ActivationRange.java
 +++ b/io/papermc/paper/entity/activation/ActivationRange.java
@@ -54,27 +54,39 @@ public final class ActivationRange {
--- a/luminol-server/minecraft-patches/features/0033-Gale-Skip-entity-move-if-movement-is-zero.patch
+++ b/luminol-server/minecraft-patches/features/0033-Gale-Skip-entity-move-if-movement-is-zero.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Skip entity move if movement is zero


 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 023b06e104e45ad7fb52e33b4ea785cd07ae0592..406c382ae2fdaa7d8996d250487bbdfb7e4bb7f9 100644
+index 4f0ea00cd601c62926220400c8e3597815dc4d15..a826320496a7a211cc07518adedfec9bdf8728b8 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -1104,7 +1104,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -23,7 +23,7 @@ index 023b06e104e45ad7fb52e33b4ea785cd07ae0592..406c382ae2fdaa7d8996d250487bbdfb
         final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
         // Paper start - detailed watchdog information
         ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
-@@ -5044,6 +5051,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5046,6 +5053,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
     }
 
     public final void setBoundingBox(AABB bb) {
--- a/luminol-server/minecraft-patches/features/0034-Gale-Replace-AI-attributes-with-optimized-collection.patch
+++ b/luminol-server/minecraft-patches/features/0034-Gale-Replace-AI-attributes-with-optimized-collection.patch
--- a/luminol-server/minecraft-patches/features/0035-Gale-Optimize-noise-generation.patch
+++ b/luminol-server/minecraft-patches/features/0035-Gale-Optimize-noise-generation.patch
--- a/luminol-server/minecraft-patches/features/0036-SparklyPaper-Optimize-canSee-checks.patch
+++ b/luminol-server/minecraft-patches/features/0036-SparklyPaper-Optimize-canSee-checks.patch
--- a/luminol-server/minecraft-patches/features/0037-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch
+++ b/luminol-server/minecraft-patches/features/0037-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch
--- a/luminol-server/minecraft-patches/features/0038-Leaf-Secure-seed-and-matter-seed-command.patch
+++ b/luminol-server/minecraft-patches/features/0038-Leaf-Secure-seed-and-matter-seed-command.patch
--- a/luminol-server/minecraft-patches/features/0039-Tick-regions-api.patch
+++ b/luminol-server/minecraft-patches/features/0039-Tick-regions-api.patch
--- a/luminol-server/minecraft-patches/features/0040-Add-missing-teleportation-apis-for-folia.patch
+++ b/luminol-server/minecraft-patches/features/0040-Add-missing-teleportation-apis-for-folia.patch
@@ -19,34 +19,50 @@ index 9fd3fe181df2ce6dbe695f6463d3940ac4c01167..822d401150d3764004b2570da828b4f6
             );
         });
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 406c382ae2fdaa7d8996d250487bbdfb7e4bb7f9..29fc2e5af0b6ec81c3f0c1c89f76166e7f4ac19c 100644
+index a826320496a7a211cc07518adedfec9bdf8728b8..6f9cfd8c72853d9cb30c9731a96e7f1e8f0644c4 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -4164,6 +4164,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4166,6 +4166,31 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
         }
 
         // TODO any events that can modify go HERE
 +        // Luminol start - Add missing teleportation apis
-+        if (!new me.earthme.luminol.api.entity.EntityTeleportAsyncEvent(
+        org.bukkit.Location destinationLoc;
+
+        if (pitch == null) {
+            if (yaw == null) {
+                destinationLoc = io.papermc.paper.util.MCUtil.toLocation(destination, pos, Float.NaN, Float.NaN);
+            } else {
+                destinationLoc = io.papermc.paper.util.MCUtil.toLocation(destination, pos, yaw, Float.NaN);
+            }
+        }else {
+            if (yaw == null) {
+                destinationLoc = io.papermc.paper.util.MCUtil.toLocation(destination, pos, Float.NaN, pitch);
+            }else {
+                destinationLoc = io.papermc.paper.util.MCUtil.toLocation(destination, pos, yaw, pitch);
+            }
+        }
+
+        final me.earthme.luminol.api.entity.EntityTeleportAsyncEvent wrapped = new me.earthme.luminol.api.entity.EntityTeleportAsyncEvent(
 +                this.getBukkitEntity(),
 +                cause,
-+                io.papermc.paper.util.MCUtil.toLocation(destination, pos, yaw ,pitch)
-+        ).callEvent()) {
-+            return false;
-+        }
+                destinationLoc
+        );
+
+        wrapped.callEvent();
 +        // Luminol end
 
         // check for same region
         if (destination == this.level()) {
-@@ -4280,7 +4289,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4282,7 +4307,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
             // we just select the spawn position
             case END: {
                 if (destination.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.END) {
 -                    BlockPos targetPos = ServerLevel.END_SPAWN_POINT;
-+                    BlockPos targetPos1 = ServerLevel.END_SPAWN_POINT; // Luminol - Rename
+                    BlockPos targetPos = ServerLevel.END_SPAWN_POINT; // Luminol - Rename
 +                    // Luminol start - Add missing teleportation apis
 +                    final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(origin, originPortal);
-+                    final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, targetPos1);
+                    final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, targetPos);
 +
 +                    final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
 +                            orginalPortalLocation,
@@ -54,21 +70,19 @@ index 406c382ae2fdaa7d8996d250487bbdfb7e4bb7f9..29fc2e5af0b6ec81c3f0c1c89f76166e
 +                    );
 +
 +                    portalLocateEvent.callEvent();
-+
-+                    final BlockPos targetPos = io.papermc.paper.util.MCUtil.toBlockPosition(portalLocateEvent.getDestination()); // Swap value
 +                    // Luminol end
                     // need to load chunks so we can create the platform
                     destination.moonrise$loadChunksAsync(
                         targetPos, 16, // load 16 blocks to be safe from block physics
-@@ -4305,7 +4327,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4307,7 +4343,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                         }
                     );
                 } else {
 -                    BlockPos spawnPos = destination.getSharedSpawnPos();
-+                    BlockPos spawnPos1 = destination.getSharedSpawnPos(); // Luminol - Rename
+                    BlockPos spawnPos = destination.getSharedSpawnPos(); // Luminol - Rename
 +                    // Luminol start - Add missing teleportation apis
 +                    final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(origin, originPortal);
-+                    final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, spawnPos1);
+                    final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, spawnPos);
 +
 +                    final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
 +                            orginalPortalLocation,
@@ -76,35 +90,31 @@ index 406c382ae2fdaa7d8996d250487bbdfb7e4bb7f9..29fc2e5af0b6ec81c3f0c1c89f76166e
 +                    );
 +
 +                    portalLocateEvent.callEvent();
-+
-+                    final BlockPos spawnPos = io.papermc.paper.util.MCUtil.toBlockPosition(portalLocateEvent.getDestination()); // Swap value
 +                    // Luminol end
                     // need to load chunk for heightmap
                     destination.moonrise$loadChunksAsync(
                         spawnPos, 0,
-@@ -4355,8 +4390,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4357,8 +4404,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
 
                 WorldBorder destinationBorder = destination.getWorldBorder();
                 double dimensionScale = net.minecraft.world.level.dimension.DimensionType.getTeleportationScale(origin.dimensionType(), destination.dimensionType());
 -                BlockPos targetPos = destination.getWorldBorder().clampToBounds(this.getX() * dimensionScale, this.getY(), this.getZ() * dimensionScale);
-+                BlockPos targetPos1 = destination.getWorldBorder().clampToBounds(this.getX() * dimensionScale, this.getY(), this.getZ() * dimensionScale); // Luminol - Rename
+                BlockPos targetPos = destination.getWorldBorder().clampToBounds(this.getX() * dimensionScale, this.getY(), this.getZ() * dimensionScale); // Luminol - Rename
 +                // Luminol start - Add missing teleportation apis
 +                final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(origin, originPortal);
-+                final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, targetPos1);
+                final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, targetPos);
 +
 +                final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
 +                        orginalPortalLocation,
 +                        targetPortalLocation
 +                );
-+
-+                portalLocateEvent.callEvent();
 
-+                final BlockPos targetPos = io.papermc.paper.util.MCUtil.toBlockPosition(portalLocateEvent.getDestination()); // Swap value
+                portalLocateEvent.callEvent();
 +                // Luminol end
                 ca.spottedleaf.concurrentutil.completable.CallbackCompletable<BlockUtil.FoundRectangle> portalFound
                     = new ca.spottedleaf.concurrentutil.completable.CallbackCompletable<>();
 
-@@ -4493,9 +4540,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4495,9 +4552,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
         if (!this.canPortalAsync(destination, takePassengers)) {
             return false;
         }
@@ -120,11 +130,11 @@ index 406c382ae2fdaa7d8996d250487bbdfb7e4bb7f9..29fc2e5af0b6ec81c3f0c1c89f76166e
         // Kaiiju start - sync end platform spawning & entity teleportation
         final java.util.function.Consumer<Entity> tpComplete = type == PortalType.END && destination.getTypeKey() == LevelStem.END ?
 -              e -> net.minecraft.world.level.levelgen.feature.EndPlatformFeature.createEndPlatform(destination, ServerLevel.END_SPAWN_POINT.below(), true, null) : teleportComplete;
-+              e -> { if (new me.earthme.luminol.api.portal.EndPlatformCreateEvent().callEvent()) net.minecraft.world.level.levelgen.feature.EndPlatformFeature.createEndPlatform(destination, ServerLevel.END_SPAWN_POINT.below(), true, null); } : teleportComplete; // Luminol - Add missing teleportation events
+              e -> { if (new me.earthme.luminol.api.portal.EndPlatformCreateEvent().callEvent() && ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(e.level, ServerLevel.END_SPAWN_POINT.below())) net.minecraft.world.level.levelgen.feature.EndPlatformFeature.createEndPlatform(destination, ServerLevel.END_SPAWN_POINT.below(), true, null); } : teleportComplete; // Luminol - Add missing teleportation events & Fix teleportation api threading issue
         // Kaiiju end
 
         Vec3 initialPosition = this.position();
-@@ -4569,6 +4625,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4571,6 +4637,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                         tpComplete.accept(teleported);
                     }
                     // Kaiiju end
@@ -134,3 +144,26 @@ index 406c382ae2fdaa7d8996d250487bbdfb7e4bb7f9..29fc2e5af0b6ec81c3f0c1c89f76166e
                 }
             );
         });
+diff --git a/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
+index 61887e6b052bca715c90dff5d9cd657e0b3f6a78..4f18340a99b141e15f74595282155bbd9632fb86 100644
+--- a/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
+@@ -193,6 +193,18 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
+             portalTile.trySearchForExit(portalWorld, portalPos);
+             return false;
+         }
+        // Luminol start - Add missing teleportation apis
+        final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(toTeleport.level(), portalPos);
+        final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(portalWorld, teleportPos);
+
+        final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
+                orginalPortalLocation,
+                targetPortalLocation
+        );
+
+        portalLocateEvent.callEvent();
+        // Luminol end
+
+ 
+         // note: we handle the position from the TeleportTransition
+         net.minecraft.world.level.portal.TeleportTransition teleport = net.minecraft.world.level.block.EndGatewayBlock.getTeleportTransition(
--- a/luminol-server/minecraft-patches/features/0041-Leaves-Disable-moved-wrongly-threshold.patch
+++ b/luminol-server/minecraft-patches/features/0041-Leaves-Disable-moved-wrongly-threshold.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: adabugra <57899270+adabugra@users.noreply.github.com>
+Date: Fri, 31 Jan 2025 19:17:01 +0300
+Subject: [PATCH] Leaves Disable moved wrongly threshold
+
+
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 8c822dffc114b6aa6ddf2443606a1f9dc9262c45..60d8e9aca76614ca4ed235e96e0e9867a40e8bf5 100644
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -579,7 +579,7 @@ public class ServerGamePacketListenerImpl
+                     return;
+                 }
+                 // Paper end - Prevent moving into unloaded chunks
+-                if (d7 - d6 > Math.max(100.0, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isSingleplayerOwner()) {
+                if (!me.earthme.luminol.config.modules.misc.DisableMovedWronglyThreshold.enabled && d7 - d6 > Math.max(100.0, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isSingleplayerOwner()) { // Leaves - disable can
+                     // CraftBukkit end
+                     LOGGER.warn(
+                         "{} (vehicle of {}) moved too quickly! {},{},{}", rootVehicle.getName().getString(), this.player.getName().getString(), d3, d4, d5
+@@ -609,7 +609,7 @@ public class ServerGamePacketListenerImpl
+                 d5 = d2 - rootVehicle.getZ();
+                 d7 = d3 * d3 + d4 * d4 + d5 * d5;
+                 boolean flag2 = false;
+-                if (d7 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
+                if (!me.earthme.luminol.config.modules.misc.DisableMovedWronglyThreshold.enabled && d7 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot / Leaves - disable can
+                     flag2 = true; // Paper - diff on change, this should be moved wrongly
+                     LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", rootVehicle.getName().getString(), this.player.getName().getString(), Math.sqrt(d7));
+                 }
+@@ -1434,7 +1434,7 @@ public class ServerGamePacketListenerImpl
+ 
+                                 if (this.shouldCheckPlayerMovement(isFallFlying)) {
+                                     float f2 = isFallFlying ? 300.0F : 100.0F;
+-                                    if (d7 - d6 > Math.max(f2, Mth.square(org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed))) {
+                                    if (!me.earthme.luminol.config.modules.misc.DisableMovedWronglyThreshold.enabled && d7 - d6 > Math.max(f2, Mth.square(org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed))) { // Leaves - disable can
+                                         // CraftBukkit end
+                                         // Paper start - Add fail move event
+                                         io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
+@@ -1506,7 +1506,8 @@ public class ServerGamePacketListenerImpl
+                             d5 = d2 - this.player.getZ();
+                             d7 = d3 * d3 + d4 * d4 + d5 * d5;
+                             boolean movedWrongly = false; // Paper - Add fail move event; rename
+-                            if (!this.player.isChangingDimension()
+                            if (!me.earthme.luminol.config.modules.misc.DisableMovedWronglyThreshold.enabled // Leaves - disable can
+                                && !this.player.isChangingDimension()
+                                 && d7 > org.spigotmc.SpigotConfig.movedWronglyThreshold // Spigot
+                                 && !this.player.isSleeping()
+                                 && !this.player.gameMode.isCreative()
--- a/luminol-server/minecraft-patches/features/0042-Raytracing-tracker-experiment.patch
+++ b/luminol-server/minecraft-patches/features/0042-Raytracing-tracker-experiment.patch
@@ -0,0 +1,159 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <wangxyper@163.com>
+Date: Wed, 5 Feb 2025 15:22:19 +0800
+Subject: [PATCH] Raytracing tracker experiment
+
+Based on the framework of EntityCulling(((((((
+
+diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
+index 7eff847790394aecd058e7a61905da86163b4c6e..9099457f55a2829297ac1db8a69a98ff717d9a86 100644
+--- a/net/minecraft/server/level/ChunkMap.java
+++ b/net/minecraft/server/level/ChunkMap.java
+@@ -1208,7 +1208,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+                 double d1 = vec3_dx * vec3_dx + vec3_dz * vec3_dz; // Paper
+                 double d2 = d * d;
+                 // Paper start - Configurable entity tracking range by Y
+-                boolean flag = d1 <= d2;
+                boolean flag = d1 <= d2 && !entity.isCulled(); // Luminol - Ray tracing entity tracker
+                 if (flag && level.paperConfig().entities.trackingRangeY.enabled) {
+                     double rangeY = level.paperConfig().entities.trackingRangeY.get(this.entity, -1);
+                     if (rangeY != -1) {
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index 6f9cfd8c72853d9cb30c9731a96e7f1e8f0644c4..b1ded501047f75d2e7af775bf8866fd6a5400a91 100644
+--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
+@@ -136,7 +136,7 @@ import net.minecraft.world.scores.ScoreHolder;
+ import net.minecraft.world.scores.Team;
+ import org.slf4j.Logger;
+ 
+-public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess, ScoreHolder, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity, ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity {  // Paper - rewrite chunk system // Paper - optimise entity tracker
+public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess, ScoreHolder, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity, ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity, dev.tr7zw.entityculling.versionless.access.Cullable {  // Paper - rewrite chunk system // Paper - optimise entity tracker // Luminol - Ray tracing entity tracker
+ 
+     // CraftBukkit start
+     private static final int CURRENT_LEVEL = 2;
+@@ -6050,4 +6050,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+     // Paper end - Expose entity id counter
+ 
+     public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG
+
+    private long lasttime = 0;
+    private boolean culled = false;
+    private boolean outOfCamera = false;
+
+    @Override
+    public void setTimeout() {
+        this.lasttime = System.currentTimeMillis() + 1000;
+    }
+
+    @Override
+    public boolean isForcedVisible() {
+        return this.lasttime > System.currentTimeMillis();
+    }
+
+    @Override
+    public void setCulled(boolean value) {
+        this.culled = value;
+        if (!value) {
+            setTimeout();
+        }
+    }
+
+    @Override
+    public boolean isCulled() {
+        if (!me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.enabled)
+            return false;
+        return this.culled;
+    }
+
+    @Override
+    public void setOutOfCamera(boolean value) {
+        this.outOfCamera = value;
+    }
+
+    @Override
+    public boolean isOutOfCamera() {
+        if (!me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.enabled)
+            return false;
+        return this.outOfCamera;
+    }
+
+ }
+diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java
+index d9cc1d7e56c37d5ce92544edc10e89dbc89dd15d..39e7689be243b9c99b507d665f6591359115287b 100644
+--- a/net/minecraft/world/entity/EntityType.java
+++ b/net/minecraft/world/entity/EntityType.java
+@@ -1097,6 +1097,9 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+     public final int passengerTickTimerId;
+     public final int passengerInactiveTickTimerId;
+     // Folia end - profiler
+    // Luminol - Raytracing entity tracker
+    public boolean skipRaytracningCheck = false;
+    // Luminol end
+ 
+     public EntityType(
+         EntityType.EntityFactory<T> factory,
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
+index 0e020dfebe06dce4c19beb10c961ea9e8a35a415..49f927c20b84e47ed2b0e57beecb3aa746448f5a 100644
+--- a/net/minecraft/world/entity/player/Player.java
+++ b/net/minecraft/world/entity/player/Player.java
+@@ -210,6 +210,25 @@ public abstract class Player extends LivingEntity {
+         return (org.bukkit.craftbukkit.entity.CraftHumanEntity) super.getBukkitEntity();
+     }
+     // CraftBukkit end
+    // Luminol start - Raytracing entity tracker
+    public dev.tr7zw.entityculling.CullTask cullTask;
+    {
+        if (!me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.enabled) {
+            this.cullTask = null;
+        }else {
+            final com.logisticscraft.occlusionculling.OcclusionCullingInstance culling = new com.logisticscraft.occlusionculling.OcclusionCullingInstance(
+                    me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.tracingDistance,
+                    new dev.tr7zw.entityculling.DefaultChunkDataProvider(this.level())
+            );
+
+            this.cullTask = new dev.tr7zw.entityculling.CullTask(
+                    culling, this,
+                    me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.hitboxLimit,
+                    me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.checkIntervalMs
+            );
+        }
+    }
+    // Luminol end
+ 
+     public Player(Level level, BlockPos pos, float yRot, GameProfile gameProfile) {
+         super(EntityType.PLAYER, level);
+@@ -262,6 +281,26 @@ public abstract class Player extends LivingEntity {
+ 
+     @Override
+     public void tick() {
+        // Luminol start - Ray tracing entity tracker
+        if (!me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.enabled) {
+            if (this.cullTask != null) this.cullTask.signalStop();
+            this.cullTask = null;
+        }else {
+            final com.logisticscraft.occlusionculling.OcclusionCullingInstance culling = new com.logisticscraft.occlusionculling.OcclusionCullingInstance(
+                    me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.tracingDistance,
+                    new dev.tr7zw.entityculling.DefaultChunkDataProvider(this.level())
+            );
+
+            this.cullTask = new dev.tr7zw.entityculling.CullTask(
+                    culling, this,
+                    me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.hitboxLimit,
+                    me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.checkIntervalMs
+            );
+        }
+        if (this.cullTask != null) this.cullTask.setup();
+        if (this.cullTask != null) this.cullTask.requestCullSignal(); // Luminol - Ray tracing entity tracker
+        // Luminol end
+
+         this.noPhysics = this.isSpectator();
+         if (this.isSpectator() || this.isPassenger()) {
+             this.setOnGround(false);
+@@ -1502,6 +1541,7 @@ public abstract class Player extends LivingEntity {
+         if (this.containerMenu != null && this.hasContainerOpen()) {
+             this.doCloseContainer();
+         }
+        if (this.cullTask != null) this.cullTask.signalStop(); // Luminol - Ray tracing entity tracker
+     }
+ 
+     // Folia start - region threading
--- a/luminol-server/paper-patches/features/0020-Skip-collision-check-if-the-block-is-not-belong-to-c.patch
+++ b/luminol-server/paper-patches/features/0020-Skip-collision-check-if-the-block-is-not-belong-to-c.patch
@@ -5,7 +5,6 @@ Subject: [PATCH] Skip collision check if the block is not belong to current
 tick region

 A temporary fix of these issues:
-https://github.com/PaperMC/Folia/issues/324
 https://github.com/PaperMC/Folia/issues/311

 Due to that mojang won't ignore the blocks the entity passed by, and sometimes the old position may not be updated and it points to a block that we don't own it, and it will access it during applyEffectsFromBlocks.So the best way to fix that is to skip the collision check of that block because it was already not owned by us and it's not necessary to check it
--- a/luminol-server/paper-patches/features/0021-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch
+++ b/luminol-server/paper-patches/features/0021-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch
--- a/luminol-server/paper-patches/features/0021-Merge-paper-12047.patch
+++ b/luminol-server/paper-patches/features/0021-Merge-paper-12047.patch
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
-Date: Fri, 31 Jan 2025 12:54:46 +0800
-Subject: [PATCH] Merge paper #12047
-
-
-diff --git a/src/main/java/io/papermc/paper/entity/activation/ActivationType.java b/src/main/java/io/papermc/paper/entity/activation/ActivationType.java
-index 01fef8353934f22a5176e731847d3df4a7df5306..f707c982ce1f650eaf8c6501b816bb5717cb0a45 100644
--- a/src/main/java/io/papermc/paper/entity/activation/ActivationType.java
-+++ b/src/main/java/io/papermc/paper/entity/activation/ActivationType.java
-@@ -28,7 +28,7 @@ public enum ActivationType {
-      * @return activation type
-      */
-     public static ActivationType activationTypeFor(final Entity entity) {
-        if (entity instanceof WaterAnimal) {
-+        if (entity instanceof WaterAnimal || entity instanceof net.minecraft.world.entity.animal.AgeableWaterCreature) { // Luminol - Merge paper #12047
-             return ActivationType.WATER;
-         } else if (entity instanceof Villager) {
-             return ActivationType.VILLAGER;
-@@ -44,4 +44,4 @@ public enum ActivationType {
-             return ActivationType.MISC;
-         }
-     }
-}
-+}
-\ No newline at end of file
--- a/luminol-server/paper-patches/features/0022-Kaiiju-Entity-tick-and-removal-limiter.patch
+++ b/luminol-server/paper-patches/features/0022-Kaiiju-Entity-tick-and-removal-limiter.patch
--- a/luminol-server/paper-patches/features/0023-Purpur-Use-alternative-keep-alive.patch
+++ b/luminol-server/paper-patches/features/0023-Purpur-Use-alternative-keep-alive.patch
--- a/luminol-server/paper-patches/features/0024-Purpur-Lobotomize-stuck-villagers.patch
+++ b/luminol-server/paper-patches/features/0024-Purpur-Lobotomize-stuck-villagers.patch
--- a/luminol-server/paper-patches/features/0025-Petal-Reduce-sensor-work.patch
+++ b/luminol-server/paper-patches/features/0025-Petal-Reduce-sensor-work.patch
--- a/luminol-server/paper-patches/features/0026-Pufferfish-Reduce-projectile-chunk-loading.patch
+++ b/luminol-server/paper-patches/features/0026-Pufferfish-Reduce-projectile-chunk-loading.patch
--- a/luminol-server/paper-patches/features/0027-Pufferfish-Optimize-suffocation.patch
+++ b/luminol-server/paper-patches/features/0027-Pufferfish-Optimize-suffocation.patch
--- a/luminol-server/paper-patches/features/0028-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
+++ b/luminol-server/paper-patches/features/0028-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
--- a/luminol-server/paper-patches/features/0029-Pufferfish-SIMD-Utilities.patch
+++ b/luminol-server/paper-patches/features/0029-Pufferfish-SIMD-Utilities.patch
--- a/luminol-server/paper-patches/features/0030-Pufferfish-Sentry.patch
+++ b/luminol-server/paper-patches/features/0030-Pufferfish-Sentry.patch
--- a/luminol-server/paper-patches/features/0031-Gale-Variable-entity-wake-up-duration.patch
+++ b/luminol-server/paper-patches/features/0031-Gale-Variable-entity-wake-up-duration.patch
--- a/luminol-server/paper-patches/features/0032-SparklyPaper-Optimize-canSee-checks.patch
+++ b/luminol-server/paper-patches/features/0032-SparklyPaper-Optimize-canSee-checks.patch
--- a/luminol-server/paper-patches/features/0033-Leaf-Skip-event-if-no-listeners.patch
+++ b/luminol-server/paper-patches/features/0033-Leaf-Skip-event-if-no-listeners.patch
--- a/luminol-server/paper-patches/features/0034-Leaf-Secure-seed-and-matter-seed-command.patch
+++ b/luminol-server/paper-patches/features/0034-Leaf-Secure-seed-and-matter-seed-command.patch
--- a/luminol-server/paper-patches/features/0035-Tick-regions-api.patch
+++ b/luminol-server/paper-patches/features/0035-Tick-regions-api.patch
--- a/luminol-server/paper-patches/features/0036-Leaves-Disable-moved-wrongly-threshold.patch
+++ b/luminol-server/paper-patches/features/0036-Leaves-Disable-moved-wrongly-threshold.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: adabugra <57899270+adabugra@users.noreply.github.com>
+Date: Fri, 31 Jan 2025 19:17:02 +0300
+Subject: [PATCH] Leaves Disable moved wrongly threshold
+
+
+diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/DisableMovedWronglyThreshold.java b/src/main/java/me/earthme/luminol/config/modules/misc/DisableMovedWronglyThreshold.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..04d35765409781a31504e11c8ace44fd4dba2fe7
+--- /dev/null
+++ b/src/main/java/me/earthme/luminol/config/modules/misc/DisableMovedWronglyThreshold.java
+@@ -0,0 +1,20 @@
+package me.earthme.luminol.config.modules.misc;
+
+import me.earthme.luminol.config.ConfigInfo;
+import me.earthme.luminol.config.EnumConfigCategory;
+import me.earthme.luminol.config.IConfigModule;
+
+public class DisableMovedWronglyThreshold implements IConfigModule {
+    @ConfigInfo(baseName = "enabled")
+    public static boolean enabled = false;
+
+    @Override
+    public EnumConfigCategory getCategory() {
+        return EnumConfigCategory.MISC;
+    }
+
+    @Override
+    public String getBaseName() {
+        return "disable_moved_wrongly_threshold";
+    }
+}
--- a/luminol-server/paper-patches/features/0037-Raytracing-tracker-experiment.patch
+++ b/luminol-server/paper-patches/features/0037-Raytracing-tracker-experiment.patch
Author	SHA1	Message	Date
MrHua269	9ba08a6ce6	Removed paper hopper optimizations	2025-02-06 23:19:17 +08:00
Klop233	2274af4415	[ci skip] Update readme	2025-02-05 16:39:22 +08:00
MrHua269	1fe23949f0	Tidy codes	2025-02-05 16:12:51 +08:00
MrHua269	92fb91fb08	Raytracing entity tracker Based on the framework of EntityCulling(((((((	2025-02-05 15:30:33 +08:00
MrHua269	50a6e68dcc	Removed problematic apis	2025-02-04 12:01:21 +08:00
MrHua269	4f924a1594	Updated Upstream(Folia)	2025-02-03 11:57:57 +08:00
NatJerry	711c8534fe	[ci skip]Update README_EN.md	2025-02-03 10:34:26 +08:00
NatJerry	2260aed532	[ci skip]Update README_EN.md	2025-02-03 10:33:52 +08:00
NatJerry	956bc88e58	[ci skip]Update README.md	2025-02-03 08:41:45 +08:00
MrHua269	0e93cb6f59	Updated Upstream(Folia)	2025-02-03 07:33:47 +08:00
M2ke4U	1cecb38fee	Merge pull request #46 from adabugra/fix/lobotomized-villagers-not-restocking Fix: Lobotomized villagers not restocking	2025-02-01 08:36:39 +08:00
adabugra	78636dc0bd	Fix lobotomized villagers not restocking	2025-02-01 00:12:32 +03:00
M2ke4U	cdb8ff1aba	Merge pull request #45 from adabugra/feature/disable-moved-wrongly Feature: Add Leaves Disable moved wrongly threshold	2025-02-01 01:09:01 +08:00
adabugra	f8f537423c	Add Leaves Disable moved wrongly threshold	2025-01-31 19:19:15 +03:00
MrHua269	23fc8891ed	Added missing NPE checks and make async teleport event position mutable	2025-01-31 22:26:43 +08:00
MrHua269	c4c8fd3d62	Patched end gateway	2025-01-31 22:10:45 +08:00
MrHua269	a92a95b296	Fix threading issue when changed the destination position of the end portal	2025-01-31 21:40:12 +08:00
MrHua269	1c3358728a	Add missing getHandlerList methods	2025-01-31 21:19:49 +08:00