mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
2d212d6e78
Upstream has released updates that appears to apply and compile correctly Paper Changes: 7caed1a8 [CI-SKIP] Rebuild patches 777073a5 Check horse entity validity in container interactions (#2584) d69fe6c5 Fix zero-tick instant grow farms MC-113809 (#2559) c68dbb86 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#2576) 1e521994 Update Paperclip 30f9955e Fix race conditions in flush allowing for previously scheduled tasks to execute later than the flush call (#2548) 9e1620e3 Improve save logic (#2485) 72860501 [CI-SKIP] Fix duplicate patch number 87355875 Fix nether portal frame creation (#2546) 26acc9b7 Re-add flat bedrock config option
40 lines
1.9 KiB
Diff
40 lines
1.9 KiB
Diff
From 9384dee8945bc47a570c822953cb965ae9275caf Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Mon, 22 Jul 2019 14:24:26 -0500
|
|
Subject: [PATCH] Implement a hard limit for pillager outpost spawns
|
|
|
|
---
|
|
.../java/net/minecraft/server/ChunkProviderGenerate.java | 1 +
|
|
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++
|
|
2 files changed, 6 insertions(+)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
|
|
index b794a39d3..39159e34a 100644
|
|
--- a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
|
|
+++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
|
|
@@ -142,6 +142,7 @@ public class ChunkProviderGenerate extends ChunkGeneratorAbstract<GeneratorSetti
|
|
}
|
|
} else if (enumcreaturetype == EnumCreatureType.MONSTER) {
|
|
if (WorldGenerator.PILLAGER_OUTPOST.a(this.a, blockposition)) {
|
|
+ if (getWorld().purpurConfig.limitPillagerOutpostSpawns > 0 && getWorld().getEntitiesByClass(EntityPillager.class, new AxisAlignedBB(blockposition).grow(128)).size() < getWorld().purpurConfig.limitPillagerOutpostSpawns) // Purpur
|
|
return WorldGenerator.PILLAGER_OUTPOST.e();
|
|
}
|
|
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index a6f014a05..a934099d8 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -118,4 +118,9 @@ public class PurpurWorldConfig {
|
|
private void milkCuresBadOmen() {
|
|
milkCuresBadOmen = getBoolean("milk-cures-bad-omen", milkCuresBadOmen);
|
|
}
|
|
+
|
|
+ public int limitPillagerOutpostSpawns = 10;
|
|
+ private void limitPillagerOutpostSpawns() {
|
|
+ limitPillagerOutpostSpawns = getInt("limit-pillager-outpost-spawns", limitPillagerOutpostSpawns);
|
|
+ }
|
|
}
|
|
--
|
|
2.23.0.rc1
|
|
|