mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 00:47:42 +01:00
16e780dcdb
Upstream has released updates that appears to apply and compile correctly Paper Changes: ab74bb45 Speed up processing of chunk loads and generation f5dd491f Increase Light Queue Size 9ab69348 Don't load chunks when attempting to unload a chunk 38c62622 Improve Optimize Memory use logic to make iterator safer and fix bad plugins like P2
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
From de6cb27c67dbd6d7184489d2c9e5642e925d8b43 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 b844b93d77..f1cca7219e 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -307,6 +307,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 87ede14251..7596fe4e3f 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -332,6 +332,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
|
|
|