mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
4757060211
Upstream has released updates that appears to apply and compile correctly Paper Changes: df0d7b0d Update upstream CB 6ea3c2cf [CI-SKIP] Rebuild patches d7bed4cb Heavily optimise random block ticking (#2914) b66d9ff8 Update upstream CB ba71c5d6 Stop stripping private use block Unicode from signs 28d9dcfc Entity Jump API (#1587) 9976a768 Fix PlayerNaturallySpawnCreaturesEvent boolean inversion 054e20da Clean up imports on ThrownEggHatchEvent a8984ccb Add ThrownEggHatchEvent (#1982) 9f24d495 Allow nerfed blazes, endermen to take water damage (#2847)
57 lines
2.4 KiB
Diff
57 lines
2.4 KiB
Diff
From 633383d64ba31158d3e010a539e224bede30ee56 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 | 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 38b9ebaee..4696d2c05 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() ? ((World) iworldreader).purpurConfig.lavaSpeedNether : ((World) iworldreader).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 39252e687..75f8441ab 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 3caef698c..0fb8c7384 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -132,8 +132,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
|
|
|