From 1bd7b866f1033ae011212fba5ca8d0b08f5cd460 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 23 Nov 2019 17:55:42 -0600 Subject: [PATCH] Implement infinite lava --- src/main/java/net/minecraft/server/FluidTypeFlowing.java | 9 ++++++++- src/main/java/net/minecraft/server/FluidTypeLava.java | 7 +++++++ src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java index d72a88e92..e9656641b 100644 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java @@ -195,7 +195,7 @@ public abstract class FluidTypeFlowing extends FluidType { } } - if (this.f() && j >= 2) { + if (infinite(iworldreader) && j >= 2) { // Purpur IBlockData iblockdata2 = iworldreader.getType(blockposition.down()); Fluid fluid1 = iblockdata2.getFluid(); @@ -266,6 +266,13 @@ public abstract class FluidTypeFlowing extends FluidType { return (Fluid) this.e().h().set(FluidTypeFlowing.FALLING, flag); } + // Purpur start + protected boolean infinite(IWorldReader iworldreader) { + return infinite(); + } + // Purpur end + + protected boolean infinite() { return f(); } // Purpur - OBFHELPER protected abstract boolean f(); protected void a(GeneratorAccess generatoraccess, BlockPosition blockposition, IBlockData iblockdata, EnumDirection enumdirection, Fluid fluid) { diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java index 29930e801..9e543449c 100644 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java @@ -147,6 +147,13 @@ public abstract class FluidTypeLava extends FluidTypeFlowing { generatoraccess.triggerEffect(1501, blockposition, 0); } + // Purpur start + @Override + protected boolean infinite(IWorldReader iworldreader) { + return iworldreader.getWorldBorder().world.purpurConfig.lavaInfinite; + } + // Purpur end + @Override protected boolean f() { return false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java index 224f1e9a0..01e5253e2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -138,6 +138,11 @@ public class PurpurWorldConfig { farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow); } + public boolean lavaInfinite = false; + private void lavaSettings() { + lavaInfinite = getBoolean("blocks.lava.infinite-source", lavaInfinite); + } + public boolean signAllowColors = false; public boolean signRightClickEdit = false; private void signSettings() { -- 2.26.2