aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0979-Per-world-ticks-per-spawn-settings.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0979-Per-world-ticks-per-spawn-settings.patch')
-rw-r--r--patches/server/0979-Per-world-ticks-per-spawn-settings.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/patches/server/0979-Per-world-ticks-per-spawn-settings.patch b/patches/server/0979-Per-world-ticks-per-spawn-settings.patch
new file mode 100644
index 0000000000..ebdf89762d
--- /dev/null
+++ b/patches/server/0979-Per-world-ticks-per-spawn-settings.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sat, 13 Nov 2021 12:36:26 -0800
+Subject: [PATCH] Per world ticks per spawn settings
+
+
+diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+index 51c4877ffb77ece41e90d9c6ac06c04dc941e35c..975fcd4b8f93cb8c602ddeb165c485214eac10a4 100644
+--- a/src/main/java/net/minecraft/world/level/Level.java
++++ b/src/main/java/net/minecraft/world/level/Level.java
+@@ -185,6 +185,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+ return this.getChunkIfLoaded(chunkX, chunkZ) != null;
+ }
+ // Paper end - Use getChunkIfLoadedImmediately
++ // Paper start - per world ticks per spawn
++ private int getTicksPerSpawn(SpawnCategory spawnCategory) {
++ final int perWorld = this.paperConfig().entities.spawning.ticksPerSpawn.getInt(CraftSpawnCategory.toNMS(spawnCategory));
++ if (perWorld >= 0) {
++ return perWorld;
++ }
++ return this.getCraftServer().getTicksPerSpawns(spawnCategory);
++ }
++ // Paper end
+
+ public abstract ResourceKey<LevelStem> getTypeKey();
+
+@@ -197,7 +206,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+ // CraftBukkit Ticks things
+ for (SpawnCategory spawnCategory : SpawnCategory.values()) {
+ if (CraftSpawnCategory.isValidForLimits(spawnCategory)) {
+- this.ticksPerSpawnCategory.put(spawnCategory, (long) this.getCraftServer().getTicksPerSpawns(spawnCategory));
++ this.ticksPerSpawnCategory.put(spawnCategory, this.getTicksPerSpawn(spawnCategory)); // Paper
+ }
+ }
+