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

Updated Upstream (Paper)

Browse Source 
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)
This commit is contained in:
William Blake Galbreath
2020-02-12 21:21:34 -06:00
parent e52e23265f
commit 4757060211
159 changed files with 6166 additions and 4642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
patches/server/0094-Make-lava-flow-speed-configurable.patch
View File

@@ -1,60 +0,0 @@
From 8306390fb9aa91c6d9ab57b7e4cd78b7207bb070 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 | 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 09f82c2d9..360470142 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 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 915b3beb2..a49ccf289 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -161,8 +161,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);
+ 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;
--
2.24.0