fix: lava can't be contained

AllayMC · Dec 28, 2024 · e8086fd · e8086fd
1 parent 3e884fe
commit e8086fd
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/server/src/main/java/org/allaymc/server/block/component/BlockLiquidBaseComponentImpl.java b/server/src/main/java/org/allaymc/server/block/component/BlockLiquidBaseComponentImpl.java
@@ -226,7 +226,11 @@ protected boolean flowInto(Dimension dimension, Vector3ic src, BlockState liquid
             return true;
         }
 
-        var canContainLiquid = existing.getBlockStateData().canContainLiquid();
+        var canContainLiquid =
+                // We can't flow into if the liquid cannot be contained (e.g. lava)
+                canBeContained() &&
+                // We can't flow into if the existing block can't contain liquid
+                existing.getBlockStateData().canContainLiquid();
         if (canContainLiquid) {
             if (getLiquidInWorld(dimension, pos).right() != null) {
                 // We've got a liquid displacer, and it's got a liquid within it, so we can't flow into this.
@@ -236,7 +240,7 @@ protected boolean flowInto(Dimension dimension, Vector3ic src, BlockState liquid
 
         var liquidReactionOnTouch = existing.getBlockStateData().liquidReactionOnTouch();
         var removedOnTouch = liquidReactionOnTouch.removedOnTouch();
-        if (!removedOnTouch && (!canContainLiquid || !canContainSpecificLiquid(existing.getBlockStateData(), getLiquidBlockState(newDepth, falling)))) {
+        if (!(existing.getBlockType() == BlockTypes.AIR || removedOnTouch) && (!canContainLiquid || !canContainSpecificLiquid(existing.getBlockStateData(), getLiquidBlockState(newDepth, falling)))) {
             // Can't flow into this block.
             return false;
         }