2021-06-11 14:02:28 +02:00
|
|
|
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
|
2021-11-24 18:58:26 +01:00
|
|
|
index 2342c42264d902df8553e81d02844296879c23b9..275c9e6c60dc78bc2acc6fc8a78727d2030babdd 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2021-11-24 18:58:26 +01:00
|
|
|
@@ -457,5 +457,10 @@ public class PaperWorldConfig {
|
2021-11-24 06:44:21 +01:00
|
|
|
private void disableRelativeProjectileVelocity() {
|
|
|
|
disableRelativeProjectileVelocity = getBoolean("game-mechanics.disable-relative-projectile-velocity", false);
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public boolean disablePillagerPatrols = false;
|
|
|
|
+ private void pillagerSettings() {
|
|
|
|
+ disablePillagerPatrols = getBoolean("game-mechanics.disable-pillager-patrols", disablePillagerPatrols);
|
|
|
|
+ }
|
|
|
|
}
|
2021-06-13 21:29:58 +02:00
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/levelgen/PatrolSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PatrolSpawner.java
|
2021-11-24 06:44:21 +01:00
|
|
|
index 96da518295362665270bcd5ff3031f1d9a152b1f..4fc90f8a1fa199a1af6c125ccadcb78c970671ec 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/levelgen/PatrolSpawner.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/levelgen/PatrolSpawner.java
|
2021-11-24 06:44:21 +01:00
|
|
|
@@ -23,6 +23,7 @@ public class PatrolSpawner implements CustomSpawner {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@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)) {
|