Paper/Spigot-Server-Patches/0053-Configurable-lava-flow-speed.patch

41 lines
1.9 KiB
Diff
Raw Normal View History

From 4983f09972f340718b3dce467b9ae791be927718 Mon Sep 17 00:00:00 2001
2015-07-01 09:39:31 +02:00
From: Byteflux <byte@byteflux.net>
Date: Wed, 1 Jul 2015 00:38:10 -0700
Subject: [PATCH] Configurable lava flow speed
diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
2015-07-14 17:59:57 +02:00
index fc3fc48..23130ba 100644
2015-07-01 09:39:31 +02:00
--- a/src/main/java/net/minecraft/server/BlockFlowing.java
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java
@@ -276,6 +276,9 @@ public class BlockFlowing extends BlockFluids {
* PaperSpigot - Get flow speed. Throttle if its water and flowing adjacent to lava
*/
public int getFlowSpeed(World world, BlockPosition blockposition) {
+ if (this.getMaterial() == Material.LAVA) {
+ return world.worldProvider.o() ? world.paperSpigotConfig.lavaFlowSpeedNether : world.paperSpigotConfig.lavaFlowSpeedNormal;
+ }
if (this.getMaterial() == Material.WATER && (
world.getType(blockposition.north(1)).getBlock().getMaterial() == Material.LAVA ||
world.getType(blockposition.south(1)).getBlock().getMaterial() == Material.LAVA ||
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
index 2ecacd5..9ae1b18 100644
2015-07-01 09:39:31 +02:00
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -352,4 +352,12 @@ public class PaperSpigotWorldConfig
fastDrainLava = getBoolean( "fast-drain.lava", false );
fastDrainWater = getBoolean( "fast-drain.water", false );
}
+
+ public int lavaFlowSpeedNormal;
+ public int lavaFlowSpeedNether;
+ private void lavaFlowSpeed()
+ {
+ lavaFlowSpeedNormal = getInt( "lava-flow-speed.normal", 30 );
+ lavaFlowSpeedNether = getInt( "lava-flow-speed.nether", 10 );
+ }
}
--
2.5.2
2015-07-01 09:39:31 +02:00