Paper/patches/server-remapped/0760-add-per-world-spawn-limits.patch
Mariell Hoversholm a207d14a0e
Rename all patches to correct numbering scheme
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 15:46:44 +02:00

50 lines
2.5 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: chase <chasewhip20@gmail.com>
Date: Wed, 2 Dec 2020 22:43:39 -0800
Subject: [PATCH] add per world spawn limits
Taken from #2982. Credit to Chasewhip8
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index dc5ebbb44238cb5928f385d2962c9057388575f8..f80186f663ff654ab6b69189941cd26815f65f09 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -652,6 +652,19 @@ public class PaperWorldConfig {
zombieVillagerInfectionChance = getDouble("zombie-villager-infection-chance", zombieVillagerInfectionChance);
}
+ public int spawnLimitMonsters = -1;
+ public int spawnLimitAnimals = -1;
+ public int spawnLimitWaterAnimals = -1;
+ public int spawnLimitWaterAmbient = -1;
+ public int spawnLimitAmbient = -1;
+ private void perWorldSpawnLimits() {
+ spawnLimitMonsters = getInt("spawn-limits.monsters", spawnLimitMonsters);
+ spawnLimitAnimals = getInt("spawn-limits.animals", spawnLimitAnimals);
+ spawnLimitWaterAnimals = getInt("spawn-limits.water-animals", spawnLimitWaterAnimals);
+ spawnLimitWaterAmbient = getInt("spawn-limits.water-ambient", spawnLimitWaterAmbient);
+ spawnLimitAmbient = getInt("spawn-limits.ambient", spawnLimitAmbient);
+ }
+
public int lightQueueSize = 20;
private void lightQueueSize() {
lightQueueSize = getInt("light-queue-size", lightQueueSize);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 312ed9c693cc5108d51ad90e15d6be4bb21904e1..89aac4214084bd72a83eaaf043b7d47cc0b748f5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -335,6 +335,13 @@ public class CraftWorld implements World {
this.generator = gen;
environment = env;
+ // Paper start - per world spawn limits
+ this.monsterSpawn = this.world.paperConfig.spawnLimitMonsters;
+ this.animalSpawn = this.world.paperConfig.spawnLimitAnimals;
+ this.waterAnimalSpawn = this.world.paperConfig.spawnLimitWaterAnimals;
+ this.waterAmbientSpawn = this.world.paperConfig.spawnLimitWaterAmbient;
+ this.ambientSpawn = this.world.paperConfig.spawnLimitAmbient;
+ // Paper end
}
@Override