mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
c0c212bf48
Upstream has released updates that appears to apply and compile correctly Paper Changes: b75eeca0 Boost light task priority to ensure it doesnt hold up chunk loads 3d2bc848 Ensure VillagerTrades doesn't load async - fixes #3495 e470f1ef Add more information to Timing Reports f4a47db6 Improve Thread Pool usage to allow single threads for single cpu servers a4fe910f Fix sounds when using worldedit regen command 70ad51a8 Updated Upstream (Bukkit/CraftBukkit) d7cfa4fa Improve legacy format serialization more
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
From 1b796add1a226554384471e84cfbd7f39f253e92 Mon Sep 17 00:00:00 2001
|
|
From: chase <chasewhip20@gmail.com>
|
|
Date: Sun, 15 Mar 2020 18:32:22 -0600
|
|
Subject: [PATCH] PaperPR - Per World Spawn limits
|
|
|
|
---
|
|
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 11 +++++++++++
|
|
src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 7 +++++++
|
|
2 files changed, 18 insertions(+)
|
|
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index 7e7f10351b..f2281d3259 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -313,6 +313,17 @@ public class PurpurWorldConfig {
|
|
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
|
|
}
|
|
|
|
+ public int spawnLimitMonsters;
|
|
+ public int spawnLimitAnimals;
|
|
+ public int spawnLimitWaterAnimals;
|
|
+ public int spawnLimitAmbient;
|
|
+ private void perWorldSpawnLimit(){
|
|
+ spawnLimitMonsters = getInt("spawn-limits.monsters", -1);
|
|
+ spawnLimitAnimals = getInt("spawn-limits.animals", -1);
|
|
+ spawnLimitWaterAnimals = getInt("spawn-limits.water-animals", -1);
|
|
+ spawnLimitAmbient = getInt("spawn-limits.ambient", -1);
|
|
+ }
|
|
+
|
|
public boolean batRidable = false;
|
|
public boolean batRidableInWater = false;
|
|
public boolean batRequireShiftToMount = true;
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
index e54cff571c..cc1fb7108a 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -333,6 +333,13 @@ public class CraftWorld implements World {
|
|
this.generator = gen;
|
|
|
|
environment = env;
|
|
+
|
|
+ // Purpur start
|
|
+ monsterSpawn = world.purpurConfig.spawnLimitMonsters;
|
|
+ animalSpawn = world.purpurConfig.spawnLimitAnimals;
|
|
+ waterAnimalSpawn = world.purpurConfig.spawnLimitWaterAnimals;
|
|
+ ambientSpawn = world.purpurConfig.spawnLimitAmbient;
|
|
+ // Purpur end
|
|
}
|
|
|
|
@Override
|
|
--
|
|
2.24.0
|
|
|