Move more options to per-world section (still more to come)

This commit is contained in:
William Blake Galbreath
2020-01-14 19:33:01 -06:00
parent bee0cc833b
commit a221240eef
35 changed files with 298 additions and 298 deletions

View File

@@ -1,4 +1,4 @@
From 2919990cd68d4e56d4d4f888e12c908fba2f39f2 Mon Sep 17 00:00:00 2001
From 66648a810a82cd772e71553dc60eeef514770c50 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Jan 2020 11:31:36 -0600
Subject: [PATCH] Make lava flow speed configurable
@@ -6,8 +6,8 @@ Subject: [PATCH] Make lava flow speed configurable
---
src/main/java/net/minecraft/server/FluidTypeLava.java | 5 ++++-
src/main/java/net/minecraft/server/WorldProvider.java | 1 +
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 4 ++++
3 files changed, 9 insertions(+), 1 deletion(-)
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 6 +++++-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
index 09f82c2d92..360470142a 100644
@@ -38,19 +38,20 @@ index 39252e6873..75f8441ab6 100644
return this.d;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8bde402422..57fbb298d3 100644
index bc8b17ab25..118ed99007 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -150,8 +150,12 @@ public class PurpurWorldConfig {
@@ -165,8 +165,12 @@ public class PurpurWorldConfig {
}
public boolean lavaInfinite = false;
+ public int lavaSpeedNether = 10;
+ public int lavaSpeedNotNether = 30;
private void lavaSettings() {
lavaInfinite = getBoolean("settings.lava-flow.infinite", lavaInfinite);
+ lavaSpeedNether = getInt("settings.lava-flow.speed.nether", lavaSpeedNether);
+ lavaSpeedNotNether = getInt("settings.lava-flow.speed.not-nether", lavaSpeedNotNether);
- lavaInfinite = getBoolean("settings.lava-flow.infinite", lavaInfinite);
+ lavaInfinite = getBoolean("lava-flow.infinite", lavaInfinite);
+ lavaSpeedNether = getInt("lava-flow.speed.nether", lavaSpeedNether);
+ lavaSpeedNotNether = getInt("lava-flow.speed.not-nether", lavaSpeedNotNether);
}
public int elytraDamagePerSecond = 1;