PaperMC/patches/server/Make-targetSize-more-aggressive-in-the-chunk-unload-.patch

38 lines
2 KiB
Diff
Raw Normal View History

2021-11-30 08:32:30 +01:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 7 Feb 2017 16:55:35 -0600
Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
this.entityMap = new Int2ObjectOpenHashMap();
this.chunkTypeCache = new Long2ByteOpenHashMap();
2022-03-01 06:43:03 +01:00
this.chunkSaveCooldowns = new Long2LongOpenHashMap();
2021-11-30 08:32:30 +01:00
- this.unloadQueue = Queues.newConcurrentLinkedQueue();
this.structureManager = structureManager;
2022-03-01 06:43:03 +01:00
+ this.unloadQueue = new com.destroystokyo.paper.utils.CachedSizeConcurrentLinkedQueue<>(); // Paper - need constant-time size()
2021-11-30 08:32:30 +01:00
Path path = session.getDimensionPath(world.dimension());
2022-03-01 06:43:03 +01:00
this.storageName = path.getFileName().toString();
2021-11-30 08:32:30 +01:00
@@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
private void processUnloads(BooleanSupplier shouldKeepTicking) {
LongIterator longiterator = this.toDrop.iterator();
-
for (int i = 0; longiterator.hasNext() && (shouldKeepTicking.getAsBoolean() || i < 200 || this.toDrop.size() > 2000); longiterator.remove()) {
2021-11-30 08:32:30 +01:00
long j = longiterator.nextLong();
ChunkHolder playerchunk = (ChunkHolder) this.updatingChunkMap.remove(j);
2021-11-30 08:32:30 +01:00
@@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
}
2021-11-30 08:32:30 +01:00
}
- int k = Math.max(0, this.unloadQueue.size() - 2000);
+ int k = Math.max(100, this.unloadQueue.size() - 2000); // Paper - Unload more than just up to queue size 2000
2021-11-30 08:32:30 +01:00
Runnable runnable;