Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
9dfe1321 Delay Chunk Unloads based on Player Movement
f0409edc Drop Close region files patch, doesn't add any value.
700070c5 Fix undesirable behavior around world level changes due to priority
This commit is contained in:
William Blake Galbreath
2020-06-08 20:04:51 -05:00
parent 1564cefa74
commit 2fbbafa299
12 changed files with 19 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
patches/server/0122-PaperPR-Per-World-Spawn-limits.patch Normal file
View File

@@ -0,0 +1,53 @@
From 6f1e3968ebb8f81a84e28d28cd64f48c5fc7f9c9 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.26.2