Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make lava flow speed configurable

Browse Source
This commit is contained in:
William Blake Galbreath
2020-01-02 11:34:00 -06:00
parent 99b8388073
commit 25433fabdd
3 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/source/configuration.rst
View File

@@ -410,6 +410,13 @@ lava-flow
* infinite
* **default:** false
* **description:** Allow lava to take on infinite supply properties similar to water (two source blocks flowing together creates a new source block)
* speed
* nether
* **default:** 10
* **description:** Delay in ticks between physics/flowing (lower is faster)
* not-nether
* **default:** 30
* **description:** Delay in ticks between physics/flowing (lower is faster)
player
* exp-dropped-on-death

6
patches/server/0085-Option-for-hay-block-fall-damage.patch
View File

@@ -1,4 +1,4 @@
From 67fa4008e46e6dd610abc3bef9ac7b86419ee2ab Mon Sep 17 00:00:00 2001
From e93a887f22af6046e4070afd97c9d5b8033a202d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 30 Nov 2019 01:31:09 -0600
Subject: [PATCH] Option for hay block fall damage
@@ -21,11 +21,11 @@ index ca81c49f0a..ca8f957989 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9594d72e35..fbe7063441 100644
index c618169db3..2de81f0d3e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -149,6 +149,11 @@ public class PurpurWorldConfig {
lavaInfinite = getBoolean("settings.infinite-lava", lavaInfinite);
lavaInfinite = getBoolean("settings.lava-flow.infinite", lavaInfinite);
}
+ public boolean hayBlockFallDamage = true;

59
patches/server/0096-Make-lava-flow-speed-configurable.patch Normal file
View File

@@ -0,0 +1,59 @@
From 5843b2181d73bf9aa67a0030357ec385355492a8 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
---
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(-)
diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
index 09f82c2d92..360470142a 100644
--- a/src/main/java/net/minecraft/server/FluidTypeLava.java
+++ b/src/main/java/net/minecraft/server/FluidTypeLava.java
@@ -129,7 +129,10 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
@Override
public int a(IWorldReader iworldreader) {
- return iworldreader.getWorldProvider().g() ? 10 : 30;
+ // Purpur start
+ net.pl3x.purpur.PurpurWorldConfig config = iworldreader.getWorldProvider().getWorld().purpurConfig;
+ return iworldreader.getWorldProvider().isHell() ? config.lavaSpeedNether : config.lavaSpeedNotNether;
+ // Purpur end
}
@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 3a750bedee..71aadd05f9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -145,8 +145,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);
}
public boolean hayBlockFallDamage = true;
--
2.24.0