mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
2f782a6652
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
42 lines
2.3 KiB
Diff
42 lines
2.3 KiB
Diff
From 5adde883121a04ed9985885881d9b0a640d53d2b 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/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
index e0e11b6f2e..fba9f4b8a1 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
@@ -81,7 +81,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
|
|
this.v = new AtomicInteger();
|
|
this.playerMap = new PlayerMap();
|
|
this.trackedEntities = new Int2ObjectOpenHashMap();
|
|
- this.A = Queues.newConcurrentLinkedQueue();
|
|
+ this.A = new com.destroystokyo.paper.utils.CachedSizeConcurrentLinkedQueue<>(); // Paper
|
|
this.definedStructureManager = definedstructuremanager;
|
|
this.x = worldserver.getWorldProvider().getDimensionManager().a(file);
|
|
this.world = worldserver;
|
|
@@ -324,7 +324,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
|
|
// Spigot start
|
|
org.spigotmc.SlackActivityAccountant activityAccountant = this.world.getMinecraftServer().slackActivityAccountant;
|
|
activityAccountant.startActivity(0.5);
|
|
- int targetSize = (int) (this.unloadQueue.size() * UNLOAD_QUEUE_RESIZE_FACTOR);
|
|
+ int targetSize = Math.min(this.unloadQueue.size() - 100, (int) (this.unloadQueue.size() * UNLOAD_QUEUE_RESIZE_FACTOR)); // Paper - Make more aggressive
|
|
// Spigot end
|
|
while (longiterator.hasNext()) { // Spigot
|
|
long j = longiterator.nextLong();
|
|
@@ -346,7 +346,9 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
|
|
|
|
Runnable runnable;
|
|
|
|
- while (booleansupplier.getAsBoolean() && (runnable = (Runnable) this.A.poll()) != null) {
|
|
+ int queueTarget = Math.min(this.A.size() - 100, (int) (this.A.size() * UNLOAD_QUEUE_RESIZE_FACTOR)); // Paper - Target this queue as well
|
|
+
|
|
+ while ((booleansupplier.getAsBoolean() || this.A.size() > queueTarget) && (runnable = (Runnable) this.A.poll()) != null) { // Paper - Target this queue as well
|
|
runnable.run();
|
|
}
|
|
|
|
--
|
|
2.21.0
|
|
|