mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +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)
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From f7042a404bdd4b7a5d79b5f8f0b9a2b46cfdb43e Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 23 Nov 2019 17:55:42 -0600
|
|
Subject: [PATCH] Implement infinite lava
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/FluidTypeLava.java | 2 +-
|
|
src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
|
|
index ff677c59e5..240f0a9fdc 100644
|
|
--- a/src/main/java/net/minecraft/server/FluidTypeLava.java
|
|
+++ b/src/main/java/net/minecraft/server/FluidTypeLava.java
|
|
@@ -149,7 +149,7 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
|
|
|
|
@Override
|
|
protected boolean g() {
|
|
- return false;
|
|
+ return net.pl3x.purpur.PurpurConfig.infiniteLava;
|
|
}
|
|
|
|
@Override
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
index d05d69df10..37e9d13886 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
@@ -319,6 +319,11 @@ public class PurpurConfig {
|
|
slimeBlocksNotPushable = getBoolean("settings.slime-blocks-not-pushable", slimeBlocksNotPushable);
|
|
}
|
|
|
|
+ public static boolean infiniteLava = false;
|
|
+ private static void infiniteLava() {
|
|
+ infiniteLava = getBoolean("settings.infinite-lava", infiniteLava);
|
|
+ }
|
|
+
|
|
public static boolean ridableBat = true;
|
|
public static boolean ridableBlaze = true;
|
|
public static boolean ridableCat = true;
|
|
--
|
|
2.24.0.rc1
|
|
|