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:
8ce3dd5f [CI-SKIP] Fix Mojang API Brigadier dep - THIS IS NOT A NEW BUILD
00d760a5 Fix build due to spigot changing the build timestamp process
842e040c Updated Upstream (Bukkit/CraftBukkit/Spigot)
c03260a2 Add getter and setter for villager's numberOfRestocksToday (#3231)
fe366fbe null check tracker for entity metadata update - Fixes #3070
fdf41b74 Implement Brigadier Mojang API
e0ea2e0e Entity Activation Range 2.0! Major improvements to restoring behavior
10396d28 Fix Tracking Range mismatch on Vehicle/Passenger checks
This commit is contained in:
William Blake Galbreath
2020-04-28 20:14:57 -05:00
parent c0e748c0c1
commit a2db5eebbe
67 changed files with 269 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,53 @@
From ed64d76ed3cc08b9fc4edc418830b5ada0195b7d 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 9d56de22b..fa92f92b2 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 05d3a0dcc..e44cc3755 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