Re-add Configurable speed for water flowing over lava

Closes GH-1227

Spigot-Server-Patches/0354-Configurable-speed-for-water-flowing-over-lava.patch

@@ -0,0 +1,66 @@
+From a882a84e7b989a1e6587ed9bff06fb9cecfb64be Mon Sep 17 00:00:00 2001
+From: Byteflux <byte@byteflux.net>
+Date: Wed, 8 Aug 2018 16:33:21 -0600
+Subject: [PATCH] Configurable speed for water flowing over lava
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index a395406d5..db2bfb851 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -448,6 +448,12 @@ public class PaperWorldConfig {
+         }
+     }
+ 
++    public int waterOverLavaFlowSpeed;
++    private void waterOverLavaFlowSpeed() {
++        waterOverLavaFlowSpeed = getInt("water-over-lava-flow-speed", 5);
++        log("Water over lava flow speed: " + waterOverLavaFlowSpeed);
++    }
++
+     public enum DuplicateUUIDMode {
+         SAFE_REGEN, REGEN, DELETE, NOTHING, WARN
+     }
+diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
+index 6ecc1f84e..7c4986fab 100644
+--- a/src/main/java/net/minecraft/server/BlockFluids.java
++++ b/src/main/java/net/minecraft/server/BlockFluids.java
+@@ -67,11 +67,25 @@ public class BlockFluids extends Block implements IFluidSource {
+ 
+     public void onPlace(IBlockData iblockdata, World world, BlockPosition blockposition, IBlockData iblockdata1) {
+         if (this.a(world, blockposition, iblockdata)) {
+-            world.H().a(blockposition, iblockdata.s().c(), this.a((IWorldReader) world));
++            world.H().a(blockposition, iblockdata.s().c(), this.getFlowSpeed(world, blockposition)); // Paper
+         }
+ 
+     }
+ 
++    /**
++    * Paper - Get flow speed. Throttle if its water and flowing adjacent to lava
++    */
++    public int getFlowSpeed(World world, BlockPosition blockposition) {
++        if (this.material == Material.WATER && (
++                world.getType(blockposition.north(1)).getBlock().material == Material.LAVA ||
++                world.getType(blockposition.south(1)).getBlock().material == Material.LAVA ||
++                world.getType(blockposition.west(1)).getBlock().material == Material.LAVA ||
++                world.getType(blockposition.east(1)).getBlock().material == Material.LAVA)) {
++            return world.paperConfig.waterOverLavaFlowSpeed;
++        }
++        return this.a(world);
++    }
++
+     public IBlockData updateState(IBlockData iblockdata, EnumDirection enumdirection, IBlockData iblockdata1, GeneratorAccess generatoraccess, BlockPosition blockposition, BlockPosition blockposition1) {
+         if (iblockdata.s().d() || iblockdata1.s().d()) {
+             generatoraccess.H().a(blockposition, iblockdata.s().c(), this.a((IWorldReader) generatoraccess));
+@@ -82,7 +96,7 @@ public class BlockFluids extends Block implements IFluidSource {
+ 
+     public void doPhysics(IBlockData iblockdata, World world, BlockPosition blockposition, Block block, BlockPosition blockposition1) {
+         if (this.a(world, blockposition, iblockdata)) {
+-            world.H().a(blockposition, iblockdata.s().c(), this.a((IWorldReader) world));
++            world.H().a(blockposition, iblockdata.s().c(), this.getFlowSpeed(world, blockposition)); // Paper
+         }
+ 
+     }
+-- 
+2.17.1
+

removed/server/0037-Configurable-lava-flow-speed.patch

@@ -1,51 +0,0 @@
-From 2d430fe2949ebdeb5057951e790b9cf0a42704f0 Mon Sep 17 00:00:00 2001
-From: Byteflux <byte@byteflux.net>
-Date: Wed, 2 Mar 2016 12:27:07 -0600
-Subject: [PATCH] Configurable lava flow speed
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index dbd82d5a9..b0b3033e7 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -190,4 +190,11 @@ public class PaperWorldConfig {
-         fastDrainLava = getBoolean("fast-drain.lava", false);
-         fastDrainWater = getBoolean("fast-drain.water", false);
-     }
-+
-+    public int lavaFlowSpeedNormal;
-+    public int lavaFlowSpeedNether;
-+    private void lavaFlowSpeeds() {
-+        lavaFlowSpeedNormal = getInt("lava-flow-speed.normal", 30);
-+        lavaFlowSpeedNether = getInt("lava-flow-speed.nether", 10);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 3aaa19b2f..739b9aac3 100644
---- a/src/main/java/net/minecraft/server/BlockFlowing.java
-+++ b/src/main/java/net/minecraft/server/BlockFlowing.java
-@@ -272,6 +272,9 @@ public class BlockFlowing extends BlockFluids {
-      * Paper - Get flow speed. Throttle if its water and flowing adjacent to lava
-      */
-     public int getFlowSpeed(World world, BlockPosition blockposition) {
-+        if (this.material == Material.LAVA) {
-+            return world.worldProvider.isSkyMissing() ? world.paperConfig.lavaFlowSpeedNether : world.paperConfig.lavaFlowSpeedNormal;
-+        }
-         if (this.material == Material.WATER && (
-                 world.getType(blockposition.north(1)).getBlock().material == Material.LAVA ||
-                         world.getType(blockposition.south(1)).getBlock().material == Material.LAVA ||
-diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
-index f3eb2a797..d0265f960 100644
---- a/src/main/java/net/minecraft/server/WorldProvider.java
-+++ b/src/main/java/net/minecraft/server/WorldProvider.java
-@@ -114,6 +114,7 @@ public abstract class WorldProvider {
-         return this.f;
-     }
- 
-+    public final boolean isSkyMissing() { return this.n(); } // Paper - OBFHELPER
-     public boolean n() {
-         return this.e;
-     }
--- 
-2.18.0
-