mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
84e7469798
Upstream has released updates that appears to apply and compile correctly Paper Changes: 4a97a7ca Add option to disable pillager patrols (#2626) 23e53aab Backport MC-160177 fix from 1.15 (#2702) 45089d59 Update upstream CB 761c24fa Fix stuck in sneak when changing worlds (MC-10657) (#2627)
42 lines
2.0 KiB
Diff
42 lines
2.0 KiB
Diff
From b1e4664cdc73bee097d32b10c3eea44cd81045f9 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sat, 19 Oct 2019 02:20:45 -0500
|
|
Subject: [PATCH] Add option to allow iron golems to spawn in air
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/EntityIronGolem.java | 2 +-
|
|
src/main/java/net/pl3x/purpur/PurpurConfig.java | 2 ++
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
|
|
index 9bb033336c..6fdc4e6d6a 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityIronGolem.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
|
|
@@ -169,7 +169,7 @@ public class EntityIronGolem extends EntityGolem {
|
|
BlockPosition blockposition1 = blockposition.down();
|
|
IBlockData iblockdata = iworldreader.getType(blockposition1);
|
|
|
|
- if (!iblockdata.a((IBlockAccess) iworldreader, blockposition1, (Entity) this)) {
|
|
+ if (!iblockdata.a((IBlockAccess) iworldreader, blockposition1, (Entity) this) && !net.pl3x.purpur.PurpurConfig.ironGolemsCanSpawnInAir) { // Purpur
|
|
return false;
|
|
} else {
|
|
for (int i = 1; i < 3; ++i) {
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
index af808d0367..d05d69df10 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
@@ -241,8 +241,10 @@ public class PurpurConfig {
|
|
}
|
|
|
|
public static boolean ironGolemSwims = true;
|
|
+ public static boolean ironGolemsCanSpawnInAir = false;
|
|
private static void ironGolemSettings() {
|
|
ironGolemSwims = getBoolean("settings.mobs.iron_golem.swims", ironGolemSwims);
|
|
+ ironGolemsCanSpawnInAir = getBoolean("settings.mobs.iron_golem.can-spawn-in-air", ironGolemsCanSpawnInAir);
|
|
}
|
|
|
|
public static double crystalsAttackPhantomsRadius = 0.0D;
|
|
--
|
|
2.24.0.rc1
|
|
|