Do not store tick count for living entities

LuminolMC · Feb 7, 2025 · 88eb84f · 88eb84f
1 parent 19745cf
commit 88eb84f
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 7 deletions.
diff --git a/...-server/minecraft-patches/features/0022-Do-not-store-tick-count-for-living-entities.patch b/...-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 <[email protected]>
+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()
diff --git a/...aiiju-Don-t-pathfind-outside-region.patch → ...aiiju-Don-t-pathfind-outside-region.patch b/...aiiju-Don-t-pathfind-outside-region.patch → ...aiiju-Don-t-pathfind-outside-region.patch
diff --git a/...ju-Vanilla-end-portal-teleportation.patch → ...ju-Vanilla-end-portal-teleportation.patch b/...ju-Vanilla-end-portal-teleportation.patch → ...ju-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;

diff --git a/...iju-Entity-tick-and-removal-limiter.patch → ...iju-Entity-tick-and-removal-limiter.patch b/...iju-Entity-tick-and-removal-limiter.patch → ...iju-Entity-tick-and-removal-limiter.patch
diff --git a/...I-and-display-of-chunkhot-in-tpsbar.patch → ...I-and-display-of-chunkhot-in-tpsbar.patch b/...I-and-display-of-chunkhot-in-tpsbar.patch → ...I-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

diff --git a/...6-Purpur-Use-alternative-keep-alive.patch → ...7-Purpur-Use-alternative-keep-alive.patch b/...6-Purpur-Use-alternative-keep-alive.patch → ...7-Purpur-Use-alternative-keep-alive.patch
diff --git a/...7-Purpur-Lobotomize-stuck-villagers.patch → ...8-Purpur-Lobotomize-stuck-villagers.patch b/...7-Purpur-Lobotomize-stuck-villagers.patch → ...8-Purpur-Lobotomize-stuck-villagers.patch
diff --git a/...tures/0028-Petal-Reduce-sensor-work.patch → ...tures/0029-Petal-Reduce-sensor-work.patch b/...tures/0028-Petal-Reduce-sensor-work.patch → ...tures/0029-Petal-Reduce-sensor-work.patch
diff --git a/...Cache-climbing-check-for-activation.patch → ...Cache-climbing-check-for-activation.patch b/...Cache-climbing-check-for-activation.patch → ...Cache-climbing-check-for-activation.patch
diff --git a/...erfish-Reduce-chunk-loading-lookups.patch → ...erfish-Reduce-chunk-loading-lookups.patch b/...erfish-Reduce-chunk-loading-lookups.patch → ...erfish-Reduce-chunk-loading-lookups.patch
diff --git a/...31-Gale-Use-platform-math-functions.patch → ...32-Gale-Use-platform-math-functions.patch b/...31-Gale-Use-platform-math-functions.patch → ...32-Gale-Use-platform-math-functions.patch
diff --git a/...le-Variable-entity-wake-up-duration.patch → ...le-Variable-entity-wake-up-duration.patch b/...le-Variable-entity-wake-up-duration.patch → ...le-Variable-entity-wake-up-duration.patch
diff --git a/...kip-entity-move-if-movement-is-zero.patch → ...kip-entity-move-if-movement-is-zero.patch b/...kip-entity-move-if-movement-is-zero.patch → ...kip-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

diff --git a/...ttributes-with-optimized-collection.patch → ...ttributes-with-optimized-collection.patch b/...ttributes-with-optimized-collection.patch → ...ttributes-with-optimized-collection.patch
diff --git a/...0035-Gale-Optimize-noise-generation.patch → ...0036-Gale-Optimize-noise-generation.patch b/...0035-Gale-Optimize-noise-generation.patch → ...0036-Gale-Optimize-noise-generation.patch
diff --git a/...SparklyPaper-Optimize-canSee-checks.patch → ...SparklyPaper-Optimize-canSee-checks.patch b/...SparklyPaper-Optimize-canSee-checks.patch → ...SparklyPaper-Optimize-canSee-checks.patch
diff --git a/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch b/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch
diff --git a/...Secure-seed-and-matter-seed-command.patch → ...Secure-seed-and-matter-seed-command.patch b/...Secure-seed-and-matter-seed-command.patch → ...Secure-seed-and-matter-seed-command.patch
diff --git a/...ches/features/0039-Tick-regions-api.patch → ...ches/features/0040-Tick-regions-api.patch b/...ches/features/0039-Tick-regions-api.patch → ...ches/features/0040-Tick-regions-api.patch
diff --git a/...issing-teleportation-apis-for-folia.patch → ...issing-teleportation-apis-for-folia.patch b/...issing-teleportation-apis-for-folia.patch → ...issing-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

diff --git a/...ves-Disable-moved-wrongly-threshold.patch → ...ves-Disable-moved-wrongly-threshold.patch b/...ves-Disable-moved-wrongly-threshold.patch → ...ves-Disable-moved-wrongly-threshold.patch
diff --git a/.../0042-Raytracing-tracker-experiment.patch → .../0043-Raytracing-tracker-experiment.patch b/.../0042-Raytracing-tracker-experiment.patch → .../0043-Raytracing-tracker-experiment.patch
@@ -5,7 +5,6 @@ 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
@@ -20,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;

diff --git a/luminol-server/paper-patches/features/0037-Raytracing-tracker-experiment.patch b/luminol-server/paper-patches/features/0037-Raytracing-tracker-experiment.patch
@@ -5,7 +5,6 @@ Subject: [PATCH] Raytracing tracker experiment
 
 Based on the framework of EntityCulling(((((((
 
-
 diff --git a/src/main/java/com/logisticscraft/occlusionculling/DataProvider.java b/src/main/java/com/logisticscraft/occlusionculling/DataProvider.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..5ab4600554e8dcb2a2ddc22dd1c1015c89ba5b82