Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 10:57:43 +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:
14513c3c Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2019-09-13 10:27:33 -05:00
parent c349c48fb0
commit 394c0f02f8
58 changed files with 114 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
patches/server/0048-Add-option-to-disable-pillager-patrols.patch Normal file
View File

@@ -0,0 +1,41 @@
From 0ef66de9cec3bf747f5c485bc606c89ef520bd80 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 dae2fb4de..594c50a18 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -228,6 +228,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