Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

3in1: Update Upstream, Remove useless patches, Fix cramming/colliding bug

Browse Source
This commit is contained in:
William Blake Galbreath
2019-07-29 20:53:47 -05:00
parent 75774b7422
commit 9db1fe9d28
75 changed files with 421 additions and 1452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,41 @@
From 01c1f69df3650e43577f784e416c171d9b42f7d5 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 bb612b386..99bb38f03 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 3ff26e47b..77a32cf65 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -202,6 +202,11 @@ public class PurpurConfig {
phantomsOrbitCrystalsRadius = getDouble("settings.mobs.phantom.orbit-crystal-radius", phantomsOrbitCrystalsRadius);
}
+ 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.20.1