geforkt von Mirrors/Paper
Fix "unlimited" max chunk gens per tick setting
hopefully tried to set it to be unlimited in the first place....
Dieser Commit ist enthalten in:
Ursprung
6068eb129f
Commit
d5023110eb
@ -1,4 +1,4 @@
|
||||
From bb0edf578480de52c2e73890125be7724ef3088e Mon Sep 17 00:00:00 2001
|
||||
From 60c07ced088fbec1f2faba0329fcdef6c5342454 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 1 Jan 2018 16:10:24 -0500
|
||||
Subject: [PATCH] Configurable Max Chunk Gens per Tick
|
||||
@ -13,7 +13,7 @@ This should result in no noticeable speed reduction in generation for servers no
|
||||
lagging, and let larger servers reduce this value according to their own desires.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index acf32d51..964bf2d2 100644
|
||||
index acf32d51d..19c4148c6 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -459,4 +459,16 @@ public class PaperWorldConfig {
|
||||
@ -25,7 +25,7 @@ index acf32d51..964bf2d2 100644
|
||||
+ private void maxChunkGensPerTick() {
|
||||
+ maxChunkGensPerTick = getInt("max-chunk-gens-per-tick", maxChunkGensPerTick);
|
||||
+ if (maxChunkGensPerTick <= 0) {
|
||||
+ maxChunkSendsPerTick = Integer.MAX_VALUE;
|
||||
+ maxChunkGensPerTick = Integer.MAX_VALUE;
|
||||
+ log("Max Chunk Gens Per Tick: Unlimited (NOT RECOMMENDED)");
|
||||
+ } else {
|
||||
+ log("Max Chunk Gens Per Tick: " + maxChunkGensPerTick);
|
||||
@ -34,7 +34,7 @@ index acf32d51..964bf2d2 100644
|
||||
+
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
|
||||
index 045adbd3..20e734bc 100644
|
||||
index 045adbd3d..20e734bc8 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerChunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerChunk.java
|
||||
@@ -27,6 +27,7 @@ public class PlayerChunk {
|
||||
@ -54,7 +54,7 @@ index 045adbd3..20e734bc 100644
|
||||
// CraftBukkit end
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
index 6ee9f6cf..99652ae3 100644
|
||||
index 6ee9f6cfb..99652ae3e 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
@@ -166,6 +166,7 @@ public class PlayerChunkMap {
|
||||
@ -78,7 +78,7 @@ index 6ee9f6cf..99652ae3 100644
|
||||
if (playerchunk1.a(flag)) {
|
||||
iterator1.remove();
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
|
||||
index 9aaca21a..f50d55c8 100644
|
||||
index 9aaca21a7..f50d55c8e 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
|
||||
@@ -35,4 +35,10 @@ public class ChunkIOExecutor {
|
||||
@ -93,7 +93,7 @@ index 9aaca21a..f50d55c8 100644
|
||||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
|
||||
index 193c3621..cf1258c5 100644
|
||||
index 193c3621c..cf1258c55 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
|
||||
@@ -351,4 +351,10 @@ public final class AsynchronousExecutor<P, T, C, E extends Throwable> {
|
||||
@ -108,5 +108,5 @@ index 193c3621..cf1258c5 100644
|
||||
+ // Paper end
|
||||
}
|
||||
--
|
||||
2.14.3
|
||||
2.15.1
|
||||
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren