From 6fe11911eb836326ef2ef83a80ffbb5214f7ad57 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 11:31:36 -0600 Subject: [PATCH] Make lava flow speed configurable --- src/main/java/net/minecraft/server/FluidTypeLava.java | 2 +- src/main/java/net/minecraft/server/WorldProvider.java | 1 + src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 4 ++++ 3 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 09f82c2d92..470e9bfd01 100644 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java @@ -129,7 +129,7 @@ public abstract class FluidTypeLava extends FluidTypeFlowing { @Override public int a(IWorldReader iworldreader) { - return iworldreader.getWorldProvider().g() ? 10 : 30; + return iworldreader.getWorldProvider().isHell() ? iworldreader.getWorldProvider().getWorld().purpurConfig.lavaSpeedNether : iworldreader.getWorldProvider().getWorld().purpurConfig.lavaSpeedNotNether; // Purpur } @Override diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java index 39252e6873..75f8441ab6 100644 --- a/src/main/java/net/minecraft/server/WorldProvider.java +++ b/src/main/java/net/minecraft/server/WorldProvider.java @@ -42,6 +42,7 @@ public abstract class WorldProvider { return this.f.hasSkyLight(); } + public boolean isHell() { return g(); } // Purpur - OBFHELPER public boolean g() { return this.d; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java index e481e9639f..9bac4c5eb4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -133,8 +133,12 @@ public class PurpurWorldConfig { } public boolean lavaInfinite = false; + public int lavaSpeedNether = 10; + public int lavaSpeedNotNether = 30; private void lavaSettings() { lavaInfinite = getBoolean("blocks.lava.infinite-source", lavaInfinite); + lavaSpeedNether = getInt("blocks.lava.speed.nether", lavaSpeedNether); + lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether); } public boolean signAllowColors = false; -- 2.24.0