From 34ad7dbfc9f828cda4c841732e574c68e3b0ebc0 Mon Sep 17 00:00:00 2001 From: DaPigGuy Date: Sun, 26 Jan 2025 02:58:06 -0800 Subject: [PATCH] block/block.go: Also check liquid in `replaceableWith` --- server/block/block.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/server/block/block.go b/server/block/block.go index a9736cd57..2c55d99b9 100644 --- a/server/block/block.go +++ b/server/block/block.go @@ -135,7 +135,14 @@ func replaceableWith(tx *world.Tx, pos cube.Pos, with world.Block) bool { } b := tx.Block(pos) if replaceable, ok := b.(Replaceable); ok { - return replaceable.ReplaceableBy(with) && b != with + if !replaceable.ReplaceableBy(with) || b == with { + return false + } + if liquid, ok := tx.Liquid(pos); ok { + replaceable, ok := liquid.(Replaceable) + return ok && replaceable.ReplaceableBy(with) + } + return true } return false }