mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
7760fa6dfb
Upstream has released updates that appears to apply and compile correctly Paper Changes: d94d6a29 Optimise IEntityAccess#getPlayerByUUID (#2842) 4237539e Guard against serializing mismatching chunk coordinate (#2844) c1f57657 Updated Upstream (CraftBukkit) f5569fd3 Fix SkullMeta.setPlayerProfile() (#2833) 2f527126 Update upstream CB 4151617d Update no chunk loads for hoppers and double chests patch (#2777) d224bc03 [CI-SKIP] Passage outdated (#2776) db3af11c Fix race condition with regionfile being closed right after getting one (#2812) a817508f [CI-SKIP] Update dependency version in README.md (#2817) 9aeba7c9 Prevent bees loading chunks checking hive position (#2828)
60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
From 2919990cd68d4e56d4d4f888e12c908fba2f39f2 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 8bde402422..57fbb298d3 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 {
|
|
}
|
|
|
|
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 int elytraDamagePerSecond = 1;
|
|
--
|
|
2.24.0
|
|
|