Fix incorrect ifn check on folia's tracker process

LuminolMC · Jan 26, 2025 · 9425fd9 · 9425fd9
1 parent 7604000
commit 9425fd9
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 1 deletion.
diff --git a/.../minecraft-patches/features/0022-Fix-incorrect-ifn-check-on-folia-s-tracker-process.patch b/.../minecraft-patches/features/0022-Fix-incorrect-ifn-check-on-folia-s-tracker-process.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <wangxyper@163.com>
+Date: Sun, 26 Jan 2025 23:11:33 +0800
+Subject: [PATCH] Fix incorrect ifn check on folia's tracker process
+
+
+diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
+index 4bdb05948e9102304364f3681ce353f1cf2a0aee..5c507be097051de9a43a31bbc6190c3db7688667 100644
+--- a/net/minecraft/server/level/ChunkMap.java
++++ b/net/minecraft/server/level/ChunkMap.java
+@@ -902,7 +902,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+                         // Folia start - region threading
+                         for (Entity possible : this.level.getCurrentWorldData().trackerEntities) {
+                             ChunkMap.TrackedEntity trackedEntity1 = possible.moonrise$getTrackedEntity();
+-                            if (trackedEntity == null) {
++                            if (trackedEntity1 == null) {
+                                 continue;
+                             }
+                             // Folia end - region threading
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
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
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/...tures/0027-Petal-Reduce-sensor-work.patch → ...tures/0028-Petal-Reduce-sensor-work.patch b/...tures/0027-Petal-Reduce-sensor-work.patch → ...tures/0028-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/...30-Gale-Use-platform-math-functions.patch → ...31-Gale-Use-platform-math-functions.patch b/...30-Gale-Use-platform-math-functions.patch → ...31-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
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/...0034-Gale-Optimize-noise-generation.patch → ...0035-Gale-Optimize-noise-generation.patch b/...0034-Gale-Optimize-noise-generation.patch → ...0035-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
@@ -5,7 +5,7 @@ Subject: [PATCH] SparklyPaper Optimize canSee checks
 
 
 diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
-index 4bdb05948e9102304364f3681ce353f1cf2a0aee..af0df21e19c372f23fcac263dc56270867d5ca8c 100644
+index 5c507be097051de9a43a31bbc6190c3db7688667..7eff847790394aecd058e7a61905da86163b4c6e 100644
 --- a/net/minecraft/server/level/ChunkMap.java
 +++ b/net/minecraft/server/level/ChunkMap.java
 @@ -1224,7 +1224,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider

diff --git a/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch b/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch