33 lines
1.7 KiB
Diff
33 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||
|
|
Date: Wed, 9 Oct 2019 21:46:15 -0500
|
||
|
|
Subject: [PATCH] Add option to disable pillager patrols
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index 290e49cf0077909ad7ab8127c01ef93cf7b70b51..e726b6213cf2e8f5b326f05c0438b8f1ee2b73c5 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -575,4 +575,9 @@ public class PaperWorldConfig {
|
||
|
|
private void generatorSettings() {
|
||
|
|
generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", false);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public boolean disablePillagerPatrols = false;
|
||
|
|
+ private void pillagerSettings() {
|
||
|
|
+ disablePillagerPatrols = getBoolean("game-mechanics.disable-pillager-patrols", disablePillagerPatrols);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/level/levelgen/PatrolSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PatrolSpawner.java
|
||
|
|
index caadd1a0fa6c4c446f84629088890a09e29622d9..48efe133d294bb1b17e8ac8b44eea8a29f15845f 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/levelgen/PatrolSpawner.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/levelgen/PatrolSpawner.java
|
||
|
|
@@ -26,6 +26,7 @@ public class PatrolSpawner implements CustomSpawner {
|
||
|
|
|
||
|
|
@Override
|
||
|
|
public int tick(ServerLevel world, boolean spawnMonsters, boolean spawnAnimals) {
|
||
|
|
+ if (world.paperConfig.disablePillagerPatrols) return 0; // Paper
|
||
|
|
if (!spawnMonsters) {
|
||
|
|
return 0;
|
||
|
|
} else if (!world.getGameRules().getBoolean(GameRules.RULE_DO_PATROL_SPAWNING)) {
|