mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 10:27:44 +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
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
From 4d27b6984b51de8a6c2776fad0f52a40c9d4aa23 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sat, 27 Jul 2019 17:20:35 -0500
|
|
Subject: [PATCH] Add option to disable pillager patrols
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/MobSpawnerPatrol.java | 1 +
|
|
src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++
|
|
2 files changed, 6 insertions(+)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
|
|
index a9d32ebdf..b88040e03 100644
|
|
--- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
|
|
+++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
|
|
@@ -9,6 +9,7 @@ public class MobSpawnerPatrol {
|
|
public MobSpawnerPatrol() {}
|
|
|
|
public int a(WorldServer worldserver, boolean flag, boolean flag1) {
|
|
+ if (net.pl3x.purpur.PurpurConfig.disablePillagerPatrols) return 0; // Purpur
|
|
if (!flag) {
|
|
return 0;
|
|
} else {
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
index ed2cdf509..4243cd4d7 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
@@ -223,6 +223,11 @@ public class PurpurConfig {
|
|
pigmenDontTargetUnlessHit = getBoolean("settings.mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit);
|
|
}
|
|
|
|
+ public static boolean disablePillagerPatrols = false;
|
|
+ private static void pillagerSettings() {
|
|
+ disablePillagerPatrols = getBoolean("settings.mobs.pillager.disable-patrols", disablePillagerPatrols);
|
|
+ }
|
|
+
|
|
public static boolean snowmanDropsPumpkin = false;
|
|
public static boolean snowmanPumpkinPutBack = false;
|
|
private static void snowmansSettings() {
|
|
--
|
|
2.23.0.rc1
|
|
|