Do not store tick count for living entities

This reverts commit 9ba08a6ce6.

luminol-server/minecraft-patches/features/0020-Merge-Paper-11945-for-temporary-hopper-behavior-fix.patch

@@ -0,0 +1,19 @@
+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;

luminol-server/minecraft-patches/features/0021-Removed-paper-hopper-optimizations.patch

@@ -1,280 +0,0 @@
-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

luminol-server/minecraft-patches/features/0022-Do-not-store-tick-count-for-living-entities.patch

@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <wangxyper@163.com>
+Date: Fri, 7 Feb 2025 22:25:08 +0800
+Subject: [PATCH] Do not store tick count for living entities
+
+
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index 61814607a6c8e4ce8d07645f005ea8d53f624c95..d6d429817dac95badcb1d67e370cd37cef43fd48 100644
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
+@@ -2488,7 +2488,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+             if (this.maxAirTicks != this.getDefaultMaxAirSupply()) {
+                 compound.putInt("Bukkit.MaxAirSupply", this.getMaxAirSupply());
+             }
+-            compound.putInt("Spigot.ticksLived", this.tickCount);
++            //compound.putInt("Spigot.ticksLived", this.tickCount); // Luminol - Do not store tick count for living entities
+             // CraftBukkit end
+             Component customName = this.getCustomName();
+             if (customName != null) {
+@@ -2661,10 +2661,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+             }
+             // CraftBukkit start
+             // Spigot start
+-            if (this instanceof net.minecraft.world.entity.LivingEntity) {
++            /*if (this instanceof net.minecraft.world.entity.LivingEntity) { // Luminol - Do not store tick count for living entities
+                 this.tickCount = compound.getInt("Spigot.ticksLived");
+-            }
+-            // Spigot end
++            }*/
++            // Spigot end // Luminol - Do not store tick count for living entities
+             this.persist = !compound.contains("Bukkit.persist") || compound.getBoolean("Bukkit.persist");
+             this.visibleByDefault = !compound.contains("Bukkit.visibleByDefault") || compound.getBoolean("Bukkit.visibleByDefault");
+             // SPIGOT-6907: re-implement LivingEntity#setMaximumAir()

luminol-server/minecraft-patches/features/0024-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 61814607a6c8e4ce8d07645f005ea8d53f624c95..5979893976ab8c59a17e306cd91c9a4f5cd3738e 100644
+index d6af2839f6ad51f2a29a4e4a141778a2e93145d5..f259701b82caef0a64659c69737f12b2f8d4c30a 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;

luminol-server/minecraft-patches/features/0026-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch

@@ -159,7 +159,7 @@ index 23b342cc31c7e72ade0e1ccad86a9ccf34380f13..249cb7326c8e4012dcffdb6bbb7bfc1f
 +    // KioCG end
  }
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 5979893976ab8c59a17e306cd91c9a4f5cd3738e..4f0ea00cd601c62926220400c8e3597815dc4d15 100644
+index f259701b82caef0a64659c69737f12b2f8d4c30a..0cf1fb6b7be70f1aeb6f664d86d2c695a2b16d8b 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -5967,4 +5967,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

luminol-server/minecraft-patches/features/0034-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 4f0ea00cd601c62926220400c8e3597815dc4d15..a826320496a7a211cc07518adedfec9bdf8728b8 100644
+index 0cf1fb6b7be70f1aeb6f664d86d2c695a2b16d8b..2b1db01621cdf0db1e524c99c9ba2af5d845cdec 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

luminol-server/minecraft-patches/features/0041-Add-missing-teleportation-apis-for-folia.patch

@@ -19,7 +19,7 @@ index 9fd3fe181df2ce6dbe695f6463d3940ac4c01167..822d401150d3764004b2570da828b4f6
              );
          });
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index a826320496a7a211cc07518adedfec9bdf8728b8..6f9cfd8c72853d9cb30c9731a96e7f1e8f0644c4 100644
+index 2b1db01621cdf0db1e524c99c9ba2af5d845cdec..c14f766f1bea5c3c94d124da09d7bf9dfbfb1966 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -4166,6 +4166,31 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

luminol-server/minecraft-patches/features/0043-Raytracing-tracker-experiment.patch

@@ -19,7 +19,7 @@ index 7eff847790394aecd058e7a61905da86163b4c6e..9099457f55a2829297ac1db8a69a98ff
                      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
+index c14f766f1bea5c3c94d124da09d7bf9dfbfb1966..40c0bb7dbdd0e58ca9d3fb242774fd1fc3dc3a6c 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;