From 389cab2f6e2e2340387041579a6c2596ff0cff9a Mon Sep 17 00:00:00 2001 From: DaPigGuy Date: Wed, 8 Jan 2025 21:22:29 -0800 Subject: [PATCH] server/block: Use `breakBlock` when Carpet blocks lose support --- server/block/carpet.go | 3 +-- server/block/moss_carpet.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server/block/carpet.go b/server/block/carpet.go index d6871ac34..54a675d97 100644 --- a/server/block/carpet.go +++ b/server/block/carpet.go @@ -50,8 +50,7 @@ func (Carpet) HasLiquidDrops() bool { // NeighbourUpdateTick ... func (c Carpet) NeighbourUpdateTick(pos, _ cube.Pos, tx *world.Tx) { if _, ok := tx.Block(pos.Side(cube.FaceDown)).(Air); ok { - tx.SetBlock(pos, nil, nil) - dropItem(tx, item.NewStack(c, 1), pos.Vec3Centre()) + breakBlock(c, pos, tx) } } diff --git a/server/block/moss_carpet.go b/server/block/moss_carpet.go index 8cddb7e07..3f086cdcd 100644 --- a/server/block/moss_carpet.go +++ b/server/block/moss_carpet.go @@ -25,9 +25,9 @@ func (MossCarpet) HasLiquidDrops() bool { } // NeighbourUpdateTick ... -func (MossCarpet) NeighbourUpdateTick(pos, _ cube.Pos, tx *world.Tx) { +func (m MossCarpet) NeighbourUpdateTick(pos, _ cube.Pos, tx *world.Tx) { if _, ok := tx.Block(pos.Side(cube.FaceDown)).(Air); ok { - tx.SetBlock(pos, nil, nil) + breakBlock(m, pos, tx) } }