mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-03 01:10:37 +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
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 91700cb7ce8e0dd61fd844b85c1bd6984fbe2db4 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 1 Jan 2018 15:41:59 -0500
|
|
Subject: [PATCH] Configurable Chunks Sends per Tick setting
|
|
|
|
Vanilla already had this limited, make it configurable.
|
|
|
|
Limit how much exploration lags the server
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index e6ee13ee5..8949b0290 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -456,4 +456,13 @@ public class PaperWorldConfig {
|
|
expMergeMaxValue = getInt("experience-merge-max-value", -1);
|
|
log("Experience Merge Max Value: " + expMergeMaxValue);
|
|
}
|
|
+
|
|
+ public int maxChunkSendsPerTick = 81;
|
|
+ private void maxChunkSendsPerTick() {
|
|
+ maxChunkSendsPerTick = getInt("max-chunk-sends-per-tick", maxChunkSendsPerTick);
|
|
+ if (maxChunkSendsPerTick <= 0) {
|
|
+ maxChunkSendsPerTick = 81;
|
|
+ }
|
|
+ log("Max Chunk Sends Per Tick: " + maxChunkSendsPerTick);
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
index 4af557321..6ee9f6cfb 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
@@ -198,7 +198,7 @@ public class PlayerChunkMap {
|
|
}
|
|
|
|
if (!this.g.isEmpty()) {
|
|
- j = 81;
|
|
+ j = world.paperConfig.maxChunkSendsPerTick; // Paper
|
|
try (Timing ignored = world.timings.doChunkMapPendingSendToPlayers.startTiming()) { // Paper
|
|
Iterator iterator2 = this.g.iterator();
|
|
|
|
--
|
|
2.16.1
|
|
|