mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-24 16:18:02 +01:00
094bb03a37
- Lots of itemstack cloning removed. Only clone if the item is actually moved - Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items. However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on. - Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory - Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
68 lines
3.2 KiB
Diff
68 lines
3.2 KiB
Diff
From cc91cfedfbbbd4410d42aac800deea920935c138 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Thu, 3 Nov 2016 21:52:22 -0400
|
|
Subject: [PATCH] Prevent Auto Save if Save Queue is full
|
|
|
|
If the save queue already has 50 (configurable) of chunks pending,
|
|
then avoid processing auto save (which would add more)
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index 21ae11e0a..f84fc54ec 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -375,6 +375,11 @@ public class PaperWorldConfig {
|
|
maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
|
|
}
|
|
|
|
+ public int queueSizeAutoSaveThreshold = 50;
|
|
+ private void queueSizeAutoSaveThreshold() {
|
|
+ queueSizeAutoSaveThreshold = getInt("save-queue-limit-for-auto-save", 50);
|
|
+ }
|
|
+
|
|
public boolean removeCorruptTEs = false;
|
|
private void removeCorruptTEs() {
|
|
removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
|
|
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
|
index 9e8f67ffd..2b87329f4 100644
|
|
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
|
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
|
@@ -254,6 +254,14 @@ public class ChunkProviderServer implements IChunkProvider {
|
|
int i = 0;
|
|
|
|
// CraftBukkit start
|
|
+ // Paper start
|
|
+ final ChunkRegionLoader chunkLoader = (ChunkRegionLoader) world.getChunkProviderServer().chunkLoader;
|
|
+ final int queueSize = chunkLoader.getQueueSize();
|
|
+ if (queueSize > world.paperConfig.queueSizeAutoSaveThreshold){
|
|
+ return false;
|
|
+ }
|
|
+ final int autoSaveLimit = world.paperConfig.maxAutoSaveChunksPerTick;
|
|
+ // Paper end
|
|
Iterator iterator = this.chunks.values().iterator();
|
|
while (iterator.hasNext()) {
|
|
Chunk chunk = (Chunk) iterator.next();
|
|
@@ -267,7 +275,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
|
this.saveChunk(chunk, false); // Spigot
|
|
chunk.f(false);
|
|
++i;
|
|
- if (!flag && i >= world.paperConfig.maxAutoSaveChunksPerTick) { // Spigot - // Paper - Incremental Auto Save - cap max per tick
|
|
+ if (!flag && i >= autoSaveLimit) { // Spigot - // Paper - Incremental Auto Save - cap max per tick
|
|
return false;
|
|
}
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
|
index 8747d9a45..77943821e 100644
|
|
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
|
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
|
@@ -39,6 +39,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
|
|
this.e = dataconvertermanager;
|
|
}
|
|
|
|
+ public int getQueueSize() { return queue.size(); } // Paper
|
|
+
|
|
// CraftBukkit start - Add async variant, provide compatibility
|
|
@Nullable
|
|
public Chunk a(World world, int i, int j) throws IOException {
|
|
--
|
|
2.16.1
|
|
|