From 7efdabd44d417c01b33b5b1463d6475d77f225f2 Mon Sep 17 00:00:00 2001 From: kwazedilla Date: Tue, 3 Sep 2024 19:48:33 -0700 Subject: [PATCH] allow slabs or stairs on tractor beams --- .../ion/server/features/multiblock/MultiblockShape.kt | 1 + .../multiblock/type/misc/TractorBeamMultiblock.kt | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/src/main/kotlin/net/horizonsend/ion/server/features/multiblock/MultiblockShape.kt b/server/src/main/kotlin/net/horizonsend/ion/server/features/multiblock/MultiblockShape.kt index 3960832f20..3a1db26700 100644 --- a/server/src/main/kotlin/net/horizonsend/ion/server/features/multiblock/MultiblockShape.kt +++ b/server/src/main/kotlin/net/horizonsend/ion/server/features/multiblock/MultiblockShape.kt @@ -288,6 +288,7 @@ class MultiblockShape { val blockData: BlockData? = if (loadChunks) block.blockData else getBlockDataSafe(block.world, block.x, block.y, block.z) return@complete blockData is Slab && blockData.type == Slab.Type.DOUBLE } + fun anySlabOrStairs() = filteredTypes { it.isSlab || it.isStairs } fun terracottaOrDoubleslab() { complete( diff --git a/server/src/main/kotlin/net/horizonsend/ion/server/features/multiblock/type/misc/TractorBeamMultiblock.kt b/server/src/main/kotlin/net/horizonsend/ion/server/features/multiblock/type/misc/TractorBeamMultiblock.kt index 0e28f5a16a..ae9cf97833 100644 --- a/server/src/main/kotlin/net/horizonsend/ion/server/features/multiblock/type/misc/TractorBeamMultiblock.kt +++ b/server/src/main/kotlin/net/horizonsend/ion/server/features/multiblock/type/misc/TractorBeamMultiblock.kt @@ -43,10 +43,10 @@ object TractorBeamMultiblock : Multiblock(), InteractableMultiblock, Listener { ) override fun MultiblockShape.buildStructure() { - at(+0, +0, +0).anySlab() - at(-1, +0, +1).anySlab() - at(+1, +0, +1).anySlab() - at(+0, +0, +2).anySlab() + at(+0, +0, +0).anySlabOrStairs() + at(-1, +0, +1).anySlabOrStairs() + at(+1, +0, +1).anySlabOrStairs() + at(+0, +0, +2).anySlabOrStairs() at(+0, +0, +1).anyGlass() }