From a97207bfb26b2f00b8551c5984122c8c4a150601 Mon Sep 17 00:00:00 2001
From: My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com>
Date: Sat, 25 Sep 2021 17:13:19 -0400
Subject: allow teleporting to blocks with liquid above them

---
 .../kotlin/skytils/skytilsmod/features/impl/misc/ItemFeatures.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main')

diff --git a/src/main/kotlin/skytils/skytilsmod/features/impl/misc/ItemFeatures.kt b/src/main/kotlin/skytils/skytilsmod/features/impl/misc/ItemFeatures.kt
index 12f05793..658e1ac6 100644
--- a/src/main/kotlin/skytils/skytilsmod/features/impl/misc/ItemFeatures.kt
+++ b/src/main/kotlin/skytils/skytilsmod/features/impl/misc/ItemFeatures.kt
@@ -568,14 +568,14 @@ class ItemFeatures {
         return mc.theWorld.getBlockState(pos).block.material.isSolid && (1..2).all {
             val newPos = pos.up(it)
             val newBlock = mc.theWorld.getBlockState(newPos)
-            if (sideHit === EnumFacing.UP && Utils.equalsOneOf(
+            if (sideHit === EnumFacing.UP && (Utils.equalsOneOf(
                     newBlock.block,
                     Blocks.fire,
                     Blocks.skull
-                )
+                ) || newBlock.block is BlockLiquid)
             ) return@all false
             if (sideHit !== EnumFacing.UP && newBlock.block is BlockSign) return@all false
-            if (newBlock.block is BlockLadder || newBlock.block is BlockDoor || newBlock.block is BlockLiquid) return@all false
+            if (newBlock.block is BlockLadder || newBlock.block is BlockDoor) return@all false
             return@all newBlock.block.isPassable(mc.theWorld, newPos)
         }
     }
-- 
cgit