From aa8a9905a935aefa7f224c841315a40be8f53e4b Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Mon, 29 Nov 2021 23:32:30 -0800
Subject: [PATCH] another patch
---
...more-aggressive-in-the-chunk-unload-.patch | 37 +++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 patches/server/Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
diff --git a/patches/server/Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/patches/server/Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
new file mode 100644
index 0000000000..80f0a273de
--- /dev/null
+++ b/patches/server/Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -0,0 +1,37 @@
+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.playerMap = new PlayerMap();
+ this.entityMap = new Int2ObjectOpenHashMap();
+ this.chunkTypeCache = new Long2ByteOpenHashMap();
+- this.unloadQueue = Queues.newConcurrentLinkedQueue();
++ this.unloadQueue = new com.destroystokyo.paper.utils.CachedSizeConcurrentLinkedQueue<>(); // Paper - need constant-time size()
+ this.structureManager = structureManager;
+ Path path = session.getDimensionPath(world.dimension());
+
+@@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+ // Spigot start
+ org.spigotmc.SlackActivityAccountant activityAccountant = this.level.getServer().slackActivityAccountant;
+ activityAccountant.startActivity(0.5);
+- int targetSize = (int) (this.toDrop.size() * ChunkMap.UNLOAD_QUEUE_RESIZE_FACTOR);
++ int targetSize = Math.min(this.toDrop.size() - 100, (int) (this.toDrop.size() * ChunkMap.UNLOAD_QUEUE_RESIZE_FACTOR)); // Paper - Make more aggressive
+ // Spigot end
+ while (longiterator.hasNext()) { // Spigot
+ long j = longiterator.nextLong();
+@@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+ }
+ activityAccountant.endActivity(); // Spigot
+
+- int k = Math.max(0, this.unloadQueue.size() - 2000);
++ int k = Math.max(0, Math.min(100, this.unloadQueue.size() - (int) (this.unloadQueue.size() * UNLOAD_QUEUE_RESIZE_FACTOR))); // Paper - Target this queue as well
+
+ Runnable runnable;
+