Skip to content

Add config for chunk unload drains per tick #13465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Rothes wants to merge 2 commits into from
Closed

Add config for chunk unload drains per tick #13465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af6c97f
Add config for chunk unload drains per tick
Rothes Dec 30, 2025
5875f05
Add min constraint to `minUnloadChunksPerTick`
Rothes Dec 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions paper-server/patches/features/0001-Moonrise-optimisation-patches.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6731,10 +6731,10 @@ index 0000000000000000000000000000000000000000..7eafc5b7cba23d8dec92ecc1050afe3f
\ No newline at end of file
diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java b/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..467065e3b40df17f38716499259b46663c174fd0
index 0000000000000000000000000000000000000000..35f10335830c457dbe689a62c433bad2c9aaa39d
--- /dev/null
+++ b/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java
@@ -0,0 +1,1565 @@
@@ -0,0 +1,1566 @@
+package ca.spottedleaf.moonrise.patches.chunk_system.scheduling;
+
+import ca.spottedleaf.concurrentutil.collection.MultiThreadedQueue;
Expand Down Expand Up @@ -7918,7 +7918,8 @@ index 0000000000000000000000000000000000000000..467065e3b40df17f38716499259b4666
+ // We do need to process updates here so that any addTicket that is synchronised before this call does not go missed.
+ this.processTicketUpdates();
+
+ final int toUnloadCount = Math.max(50, (int)(unloadCountTentative * 0.05));
+ io.papermc.paper.configuration.WorldConfiguration.Chunks chunks = world.paperConfig().chunks;
+ final int toUnloadCount = Math.max(chunks.minUnloadChunksPerTick, (int)(unloadCountTentative * chunks.maxUnloadChunksPerTickFactor));
+ int processedCount = 0;
+
+ for (final ChunkUnloadQueue.SectionToUnload sectionRef : unloadSectionsForRegion) {
Expand Down Expand Up @@ -28137,7 +28138,7 @@ index 8cc5c0716392ba06501542ff5cbe71ee43979e5d..09fd99c9cbd23b5f3c899bfb00c9b896
+ // Paper end - block counting
}
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index eac79f778c33f323859543012565df36060d35d2..473d07ac3f9c640beb7594e5c540e730c0d6421e 100644
index f0121f13e73d4417a93812713956f7ab98420d6d..92ad0b17ff735801b9a4c840f14b4c12db729427 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -152,7 +152,7 @@ import org.jetbrains.annotations.Contract;
Expand Down Expand Up @@ -31715,7 +31716,7 @@ index 9dc13a5b6cc1afc118a261802c71da25ae577fe5..a49a06662de4062a77112e358f536d45

public static ProblemReporter.PathElement problemPath(ChunkPos pos) {
diff --git a/net/minecraft/world/level/chunk/ChunkGenerator.java b/net/minecraft/world/level/chunk/ChunkGenerator.java
index 2acee7d7211c4e7b9ac02e9a48d6c3ea239e6949..78600f4c583056403c93e72ec0996b00ec6d1284 100644
index faf8f53bdcaa69fbbd816739dd4f1e812ced2165..7b98964eb77a619bdaaf5a9d331e3cfe080b52a4 100644
--- a/net/minecraft/world/level/chunk/ChunkGenerator.java
+++ b/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -116,7 +116,7 @@ public abstract class ChunkGenerator {
Expand Down
4 changes: 4 additions & 0 deletions paper-server/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.google.common.collect.Table;
import com.mojang.logging.LogUtils;
import io.papermc.paper.FeatureHooks;
import io.papermc.paper.configuration.constraint.Constraints;
import io.papermc.paper.configuration.legacy.MaxEntityCollisionsInitializer;
import io.papermc.paper.configuration.legacy.RequiresSpigotInitialization;
import io.papermc.paper.configuration.mapping.MergeMap;
Expand Down Expand Up @@ -503,6 +504,9 @@ public class Collisions extends ConfigurationPart {
public class Chunks extends ConfigurationPart {
public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
public int maxAutoSaveChunksPerTick = 24;
@Constraints.Min(1)
public int minUnloadChunksPerTick = 50;
public double maxUnloadChunksPerTickFactor = 0.05;
public int fixedChunkInhabitedTime = -1;
public boolean preventMovingIntoUnloadedChunks = false;
public Duration delayChunkUnloadsBy = Duration.of("10s");
Expand Down