From 1a869207aeb1ecf3210ced9771206bfd380968b8 Mon Sep 17 00:00:00 2001 From: ThePlasticPotato Date: Fri, 27 Dec 2024 09:36:55 -0500 Subject: [PATCH] Make splitting use old assembly for now --- .../org/valkyrienskies/mod/common/util/SplitHandler.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/util/SplitHandler.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/util/SplitHandler.kt index 6b4b22ea7..81b195471 100644 --- a/common/src/main/kotlin/org/valkyrienskies/mod/common/util/SplitHandler.kt +++ b/common/src/main/kotlin/org/valkyrienskies/mod/common/util/SplitHandler.kt @@ -12,6 +12,7 @@ import org.valkyrienskies.core.api.world.connectivity.ConnectionStatus.DISCONNEC import org.valkyrienskies.core.util.datastructures.DenseBlockPosSet import org.valkyrienskies.core.util.expand import org.valkyrienskies.mod.common.ValkyrienSkiesMod +import org.valkyrienskies.mod.common.assembly.ShipAssembler import org.valkyrienskies.mod.common.assembly.createNewShipWithBlocks import org.valkyrienskies.mod.common.dimensionId import org.valkyrienskies.mod.common.getShipObjectManagingPos @@ -137,8 +138,8 @@ class SplitHandler(private val doEdges: Boolean, private val doCorners: Boolean) } for (component in toAssemble) { - //ShipAssembler.assembleToShip(level, component, true, 1.0, true) - createNewShipWithBlocks(component.first().toBlockPos(), component, level) + ShipAssembler.assembleToShip(level, component.toSet().map { it.toBlockPos() }, true, 1.0, true) + //createNewShipWithBlocks(component.first().toBlockPos(), component, level) } loadedShip?.getAttachment(SplittingDisablerAttachment::class.java)?.enableSplitting()