Skip to content

Commit 505eb7f

Browse files
committed
Fix purge-stale-tickets-frequency delaying chunk unloads
1 parent e63f637 commit 505eb7f

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

shreddedpaper-server/minecraft-patches/sources/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java.patch

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
--- a/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java
22
+++ b/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java
3-
@@ -24,6 +_,10 @@
3+
@@ -24,6 +_,11 @@
44
import com.google.gson.JsonArray;
55
import com.google.gson.JsonObject;
66
import com.mojang.logging.LogUtils;
77
+import io.multipaper.shreddedpaper.ShreddedPaper;
8+
+import io.multipaper.shreddedpaper.config.ShreddedPaperConfiguration;
89
+import io.multipaper.shreddedpaper.region.LevelChunkRegion;
910
+import io.multipaper.shreddedpaper.region.RegionPos;
1011
+import io.multipaper.shreddedpaper.util.SimpleStampedLock;
@@ -126,6 +127,22 @@
126127
if (saveStat != null) {
127128
if (saveStat.savedChunk()) {
128129
++savedChunk;
130+
@@ -803,13 +_,13 @@
131+
if (removeDelay == NO_TIMEOUT_MARKER) {
132+
return false;
133+
}
134+
- --removeDelay;
135+
+ removeDelay -= ShreddedPaperConfiguration.get().optimizations.purgeStaleTicketsFrequency; // ShreddedPaper - purgeStaleTicketsFrequency
136+
((ChunkSystemTicket<?>)(Object)ticket).moonrise$setRemoveDelay(removeDelay);
137+
return removeDelay <= 0L;
138+
}
139+
140+
public void tick() {
141+
- ++this.currentTick;
142+
+ this.currentTick += ShreddedPaperConfiguration.get().optimizations.purgeStaleTicketsFrequency; // ShreddedPaper - purgeStaleTicketsFrequency
143+
144+
final int sectionShift = ((ChunkSystemServerLevel)this.world).moonrise$getRegionChunkShift();
145+
129146
@@ -1129,6 +_,16 @@
130147
if (changedFullStatus.isEmpty()) {
131148
return;

0 commit comments

Comments
 (0)