Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +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:
b75eeca0 Boost light task priority to ensure it doesnt hold up chunk loads
3d2bc848 Ensure VillagerTrades doesn't load async - fixes #3495
e470f1ef Add more information to Timing Reports
f4a47db6 Improve Thread Pool usage to allow single threads for single cpu servers
a4fe910f Fix sounds when using worldedit regen command
70ad51a8 Updated Upstream (Bukkit/CraftBukkit)
d7cfa4fa Improve legacy format serialization more
This commit is contained in:
William Blake Galbreath
2020-06-05 21:41:54 -05:00
parent c2c6a6efd9
commit c0c212bf48
161 changed files with 754 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
patches/server/0086-Make-lava-flow-speed-configurable.patch Normal file
View File

@@ -0,0 +1,56 @@
From cd754245bf6eccc824291a97f9db8386851c3541 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 09f82c2d92..470e9bfd01 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() ? iworldreader.getWorldProvider().getWorld().purpurConfig.lavaSpeedNether : iworldreader.getWorldProvider().getWorld().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 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 f60c4b6291..c238607acb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -133,8 +133,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