Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-17 03:50:08 +01:00
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
44 Zeilen
1.7 KiB
Diff
44 Zeilen
1.7 KiB
Diff
From 2d9f35af04abffc9bf46670bf90fae53bc5c00bd 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 7391a4a6a8..af69342e6c 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -379,4 +379,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 395b5a470f..54f31349e9 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
@@ -172,7 +172,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.19.0
|
|
|