Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-05 10:20:53 +01:00
Code Issues Projects Releases Wiki Activity

Configurable lava flow speed

Browse Source
This commit is contained in:
Byteflux 2015-07-01 00:39:31 -07:00
parent 6d7eed6d75
commit d07fe95b65
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Spigot-Server-Patches/0059-Configurable-lava-flow-speed.patch Normal file
View File

@ -0,0 +1,40 @@
From 497fee67414ed7957c5bbc318c45e1789a877102 Mon Sep 17 00:00:00 2001
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
index 33ff734..261d732 100644
--- 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 4c6bfb9..20cf3ce 100644
--- 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 );
+ }
}
--
1.9.5.msysgit.1