aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2021-11-08 23:59:15 -0800
committerGitHub <[email protected]>2021-11-08 23:59:15 -0800
commita923e332ee20bbbe6319c361496c9ea5728b4d08 (patch)
treef397940e6ff621e34a85828f8fd153662333fad4 /patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
parent87121cef2912bfbaf514fdbfea75509af531de8a (diff)
downloadPaper-a923e332ee20bbbe6319c361496c9ea5728b4d08.tar.gz
Paper-a923e332ee20bbbe6319c361496c9ea5728b4d08.zip
Make despawn distance configs per-category, improve per category spawn limit config (#6717)
Also adds per-world spawn limit config in paper.yml for `underground_water_creature`, and migrates existing spawn limit config options to their Mojang names.
Diffstat (limited to 'patches/server/0260-Asynchronous-chunk-IO-and-loading.patch')
-rw-r--r--patches/server/0260-Asynchronous-chunk-IO-and-loading.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
index ccee3bed8a..3f59bba057 100644
--- a/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
+++ b/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
@@ -169,7 +169,7 @@ index 15e71c00f98721e609dfab341395313db95cdfc7..c29da813f5fcba07860314914180c9d9
import com.google.common.base.Strings;
import com.google.common.base.Throwables;
-@@ -337,4 +338,58 @@ public class PaperConfig {
+@@ -340,4 +341,58 @@ public class PaperConfig {
}
tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit);
}
@@ -2303,10 +2303,10 @@ index fb0b3c5770f66cc3590f5ac4e690a33cb6179be3..7ce854edba32ffcafaa5268d4bb2822a
DedicatedServer dedicatedserver1 = new DedicatedServer(optionset, datapackconfiguration1, thread, iregistrycustom_dimension, convertable_conversionsession, resourcepackrepository, datapackresources, null, dedicatedserversettings, DataFixers.getDataFixer(), minecraftsessionservice, gameprofilerepository, usercache, LoggerChunkProgressListener::new);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7b760a65cad1f7dd5adb3a05b8b5ed7d0f49c0a9..00920e574ee1f104781d1f776d88ec9cd45eda93 100644
+index 13f94e196ffd9f37e8049a4a76bc83389ff58d84..50d4948034036b0ec6cdf447f03743baa33ab2ac 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1000,7 +1000,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1001,7 +1001,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.getProfileCache().save(false); // Paper
}
// Spigot end