Make infinite lava setting per-world

docs/source/configuration.rst

@@ -100,11 +100,6 @@ slime-blocks-not-pushable
 * **default**: false
 * **description:** Prevent slime blocks from being pushable by pistons. Useful for preventing multiple types of duplication machines.
 
-infinite-lava
-~~~~~~~~~~~~~
-* **default:** false
-* **description:** Allow lava to take on infinite supply properties similar to water (two source blocks flowing together creates a new source block)
-
 grindstone
 ~~~~~~~~~~~~~~~~~~~~~~
 * disallow-placement
@@ -410,6 +405,12 @@ fluid-tick-events
 * **default**: true
 * **description**: Fire plugin events when fluids tick
 
+lava-flow
+~~~~~~~~~~~~~
+* infinite
+    * **default:** false
+    * **description:** Allow lava to take on infinite supply properties similar to water (two source blocks flowing together creates a new source block)
+
 player
 * exp-dropped-on-death
     * equation

patches/server/0080-Implement-infinite-lava.patch

@@ -1,42 +1,89 @@
-From e42209ce4b8ec56b6adaa9815a9d953793939d23 Mon Sep 17 00:00:00 2001
+From 51cfe6295662e3ffb5bda3331140c21d342bcc49 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 23 Nov 2019 17:55:42 -0600
 Subject: [PATCH] Implement infinite lava
 
 ---
- src/main/java/net/minecraft/server/FluidTypeLava.java | 2 +-
+ src/main/java/net/minecraft/server/FluidTypeFlowing.java | 9 ++++++++-
- src/main/java/net/pl3x/purpur/PurpurConfig.java       | 5 +++++
+ src/main/java/net/minecraft/server/FluidTypeLava.java    | 7 +++++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
+ src/main/java/net/minecraft/server/WorldProvider.java    | 2 +-
+ src/main/java/net/pl3x/purpur/PurpurWorldConfig.java     | 5 +++++
+ 4 files changed, 21 insertions(+), 2 deletions(-)
 
+diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
+index 376dca1889..c8abe61cf7 100644
+--- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
++++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
+@@ -219,7 +219,7 @@ public abstract class FluidTypeFlowing extends FluidType {
+             }
+         }
+ 
+-        if (this.f() && j >= 2) {
++        if (infinite(iworldreader) && j >= 2) { // Purpur
+             IBlockData iblockdata2 = iworldreader.getType(blockposition.down());
+             Fluid fluid1 = iblockdata2.getFluid();
+ 
+@@ -290,6 +290,13 @@ public abstract class FluidTypeFlowing extends FluidType {
+         return (Fluid) this.e().h().set(FluidTypeFlowing.FALLING, flag);
+     }
+ 
++    // Purpur start
++    protected boolean infinite(IWorldReader iworldreader) {
++        return infinite();
++    }
++    // Purpur end
++
++    protected boolean infinite() { return f(); } // Purpur - OBFHELPER
+     protected abstract boolean f();
+ 
+     protected void a(GeneratorAccess generatoraccess, BlockPosition blockposition, IBlockData iblockdata, EnumDirection enumdirection, Fluid fluid) {
 diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
-index d25368d032..88866ab34a 100644
+index d25368d032..09f82c2d92 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java
-@@ -149,7 +149,7 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
+@@ -147,6 +147,13 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
+         generatoraccess.triggerEffect(1501, blockposition, 0);
+     }
  
++    // Purpur start
++    @Override
++    protected boolean infinite(IWorldReader iworldreader) {
++        return iworldreader.getWorldProvider().getWorld().purpurConfig.lavaInfinite;
++    }
++    // Purpur end
++
      @Override
      protected boolean f() {
--        return false;
+         return false;
-+        return net.pl3x.purpur.PurpurConfig.infiniteLava; // Purpur
+diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
+index 9eba9a12c0..39252e6873 100644
+--- a/src/main/java/net/minecraft/server/WorldProvider.java
++++ b/src/main/java/net/minecraft/server/WorldProvider.java
+@@ -5,7 +5,7 @@ import javax.annotation.Nullable;
+ public abstract class WorldProvider {
+ 
+     public static final float[] a = new float[]{1.0F, 0.75F, 0.5F, 0.25F, 0.0F, 0.25F, 0.5F, 0.75F};
+-    protected final World b;
++    protected final World b; public World getWorld() { return b; } // Purpur - OBFHELPER
+     private final DimensionManager f;
+     protected boolean c;
+     protected boolean d;
+diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+index 3ad3415c4a..9594d72e35 100644
+--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
++++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+@@ -144,6 +144,11 @@ public class PurpurWorldConfig {
+         milkCuresBadOmen = getBoolean("milk-cures-bad-omen", milkCuresBadOmen);
      }
  
-     @Override
++    public boolean lavaInfinite = false;
-diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
++    private void lavaSettings() {
-index ad8332f0e5..fb4276ddf7 100644
++        lavaInfinite = getBoolean("settings.lava-flow.infinite", lavaInfinite);
---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -319,6 +319,11 @@ public class PurpurConfig {
-         slimeBlocksNotPushable = getBoolean("settings.slime-blocks-not-pushable", slimeBlocksNotPushable);
-     }
- 
-+    public static boolean infiniteLava = false;
-+    private static void infiniteLava() {
-+        infiniteLava = getBoolean("settings.infinite-lava", infiniteLava);
 +    }
 +
-     public static boolean ridableBat = true;
+     public int limitPillagerOutpostSpawns = 10;
-     public static boolean ridableBee = true;
+     private void limitPillagerOutpostSpawns() {
-     public static boolean ridableBlaze = true;
+         limitPillagerOutpostSpawns = getInt("limit-pillager-outpost-spawns", limitPillagerOutpostSpawns);
 -- 
 2.24.0
 

patches/server/0085-Option-for-hay-block-fall-damage.patch

@@ -1,4 +1,4 @@
-From 13e0dfab77cbabfffd3b5b83e86ffbab5f33ccb1 Mon Sep 17 00:00:00 2001
+From 67fa4008e46e6dd610abc3bef9ac7b86419ee2ab Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 30 Nov 2019 01:31:09 -0600
 Subject: [PATCH] Option for hay block fall damage
@@ -21,11 +21,11 @@ index ca81c49f0a..ca8f957989 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3ad3415c4a..a1237c5b9d 100644
+index 9594d72e35..fbe7063441 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -144,6 +144,11 @@ public class PurpurWorldConfig {
+@@ -149,6 +149,11 @@ public class PurpurWorldConfig {
-         milkCuresBadOmen = getBoolean("milk-cures-bad-omen", milkCuresBadOmen);
+         lavaInfinite = getBoolean("settings.infinite-lava", lavaInfinite);
      }
  
 +    public boolean hayBlockFallDamage = true;
@@ -37,5 +37,5 @@ index 3ad3415c4a..a1237c5b9d 100644
      private void limitPillagerOutpostSpawns() {
          limitPillagerOutpostSpawns = getInt("limit-pillager-outpost-spawns", limitPillagerOutpostSpawns);
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0086-Add-sleep-options.patch

@@ -1,4 +1,4 @@
-From 8294e0cf990d69e2a72ccfe927bbaa4d4b8bffb2 Mon Sep 17 00:00:00 2001
+From 18f230da2e420b38ec84967a1b5ae8c79f363faf Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 30 Nov 2019 03:30:17 -0600
 Subject: [PATCH] Add sleep options
@@ -9,7 +9,7 @@ Subject: [PATCH] Add sleep options
  2 files changed, 29 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index f405f0169..cb5f51638 100644
+index 3c9f180960..3957daf751 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -14,6 +14,11 @@ import java.util.OptionalInt;
@@ -73,10 +73,10 @@ index f405f0169..cb5f51638 100644
                  return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_NOW);
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a1237c5b9..f61ed338c 100644
+index fbe7063441..f5283d7aa5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -161,6 +161,13 @@ public class PurpurWorldConfig {
+@@ -166,6 +166,13 @@ public class PurpurWorldConfig {
          limitVillagerIronGolemSpawns = getInt("limit-villager-iron-golem-spawns", limitVillagerIronGolemSpawns);
      }
  
@@ -91,5 +91,5 @@ index a1237c5b9..f61ed338c 100644
      public boolean idleTimeoutTickNearbyEntities = false;
      public boolean idleTimeoutCountAsSleeping = false;
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0090-Add-option-for-zombie-villager-transformation-chance.patch

@@ -1,4 +1,4 @@
-From b85acca8994af61c9a054a4cd31deb648d3a0c62 Mon Sep 17 00:00:00 2001
+From 6797eea55509beb24f0826eed4ece9915772a2b2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 19 Dec 2019 16:59:46 -0600
 Subject: [PATCH] Add option for zombie villager transformation chance
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option for zombie villager transformation chance
  2 files changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 47248cc45..5703e9e70 100644
+index 47248cc45e..5703e9e70c 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -457,8 +457,19 @@ public class EntityZombie extends EntityMonster {
@@ -35,10 +35,10 @@ index 47248cc45..5703e9e70 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f61ed338c..e7b3e66f8 100644
+index f5283d7aa5..499bbe4ff2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -195,4 +195,13 @@ public class PurpurWorldConfig {
+@@ -200,4 +200,13 @@ public class PurpurWorldConfig {
          elytraDamagePerFireworkBoost = getInt("elytra.damage-per-boost.firework", elytraDamagePerFireworkBoost);
          elytraDamagePerTridentBoost = getInt("elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
      }
@@ -53,5 +53,5 @@ index f61ed338c..e7b3e66f8 100644
 +    }
  }
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0091-Add-natural-cat-spawning-options.patch

@@ -1,4 +1,4 @@
-From bdbaab8f255dc936c123e9e3bdacc4356efee739 Mon Sep 17 00:00:00 2001
+From 2ce60c74d7a9eb0691d795dfc1ebb034d82e3b4f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Dec 2019 18:52:55 -0600
 Subject: [PATCH] Add natural cat spawning options
@@ -9,7 +9,7 @@ Subject: [PATCH] Add natural cat spawning options
  2 files changed, 20 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java
-index 6024478dc..3da1af0ea 100644
+index 6024478dc0..3da1af0eac 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerCat.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java
 @@ -15,7 +15,7 @@ public class MobSpawnerCat {
@@ -59,10 +59,10 @@ index 6024478dc..3da1af0ea 100644
          return list.size() < 1 ? this.a(blockposition, world) : 0;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e7b3e66f8..a2c81fad3 100644
+index 499bbe4ff2..deccd0084a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -149,6 +149,19 @@ public class PurpurWorldConfig {
+@@ -154,6 +154,19 @@ public class PurpurWorldConfig {
          hayBlockFallDamage = getBoolean("hay-block-fall-damage", hayBlockFallDamage);
      }
  

patches/server/0092-Add-player-death-exp-control-options.patch

@@ -1,4 +1,4 @@
-From 4dcf6d4a9e6e6202b8a2275ff8576400f9644869 Mon Sep 17 00:00:00 2001
+From 704d8126bd2f4d60fde55740413be8f384583bbf Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Dec 2019 22:08:37 -0600
 Subject: [PATCH] Add player death exp control options
@@ -9,7 +9,7 @@ Subject: [PATCH] Add player death exp control options
  2 files changed, 19 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 3957daf75..15e342454 100644
+index 3957daf751..15e342454c 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1858,9 +1858,18 @@ public abstract class EntityHuman extends EntityLiving {
@@ -35,10 +35,10 @@ index 3957daf75..15e342454 100644
              return 0;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a2c81fad3..a0bf56284 100644
+index deccd0084a..6351e78902 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -149,6 +149,13 @@ public class PurpurWorldConfig {
+@@ -154,6 +154,13 @@ public class PurpurWorldConfig {
          hayBlockFallDamage = getBoolean("hay-block-fall-damage", hayBlockFallDamage);
      }