Move check

neoforged · Dec 12, 2024 · 6f79918 · 6f79918
1 parent 4b40df5
commit 6f79918
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/patches/net/minecraft/server/level/ChunkMap.java.patch b/patches/net/minecraft/server/level/ChunkMap.java.patch
@@ -59,7 +59,7 @@
 +            ChunkHolder holder = this.visibleChunkMap.get(entry.getLongKey());
 +            if (holder != null && !entry.getValue().isEmpty()) {
 +                var chunk = holder.getTickingChunk();
-+                if (chunk != null && !list.contains(chunk)) {
++                if (chunk != null) {
 +                    list.add(chunk);
 +                }
 +            }

diff --git a/patches/net/minecraft/server/level/ServerChunkCache.java.patch b/patches/net/minecraft/server/level/ServerChunkCache.java.patch
@@ -28,7 +28,12 @@
                  ChunkAccess chunkaccess1 = chunkholder.getChunkIfPresent(ChunkStatus.FULL);
                  if (chunkaccess1 != null) {
                      this.storeInCache(i, chunkaccess1, ChunkStatus.FULL);
-@@ -388,6 +_,7 @@
+@@ -384,10 +_,11 @@
+     private void collectTickingChunks(List<LevelChunk> p_363421_) {
+         this.chunkMap.forEachSpawnCandidateChunk(p_381767_ -> {
+             LevelChunk levelchunk = p_381767_.getTickingChunk();
+-            if (levelchunk != null && this.level.isNaturalSpawningAllowed(p_381767_.getPos())) {
++            if (levelchunk != null && this.level.isNaturalSpawningAllowed(p_381767_.getPos()) && !this.distanceManager.shouldForceTicks(p_381767_.getPos().toLong())) { // Neo: we add force ticked chunks in the list below
                  p_363421_.add(levelchunk);
              }
          });