From dfffedcfd93be1cb2b2c12e8acd54a73caff0630 Mon Sep 17 00:00:00 2001 From: Mirality Date: Thu, 17 Apr 2025 23:52:18 +1200 Subject: [PATCH] Fix building --- .../minecolonies/core/colony/jobs/AbstractJobStructure.java | 6 +----- .../core/placementhandlers/main/SurvivalHandler.java | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/minecolonies/core/colony/jobs/AbstractJobStructure.java b/src/main/java/com/minecolonies/core/colony/jobs/AbstractJobStructure.java index 84266e4808f..04034dc83e7 100755 --- a/src/main/java/com/minecolonies/core/colony/jobs/AbstractJobStructure.java +++ b/src/main/java/com/minecolonies/core/colony/jobs/AbstractJobStructure.java @@ -36,11 +36,6 @@ public abstract class AbstractJobStructure, J e */ private int workOrderId; - /** - * The structure the job should build. - */ - protected Blueprint blueprint; - /** * Initialize citizen data. * @@ -105,6 +100,7 @@ public void complete() { getWorkOrder().onCompleted(getCitizen().getColony(), this.getCitizen()); + final Blueprint blueprint = getWorkOrder().getBlueprint(); if (blueprint != null) { final CompoundTag[][][] tileEntityData = blueprint.getTileEntities(); diff --git a/src/main/java/com/minecolonies/core/placementhandlers/main/SurvivalHandler.java b/src/main/java/com/minecolonies/core/placementhandlers/main/SurvivalHandler.java index cdfdb66cb11..6607c04aece 100644 --- a/src/main/java/com/minecolonies/core/placementhandlers/main/SurvivalHandler.java +++ b/src/main/java/com/minecolonies/core/placementhandlers/main/SurvivalHandler.java @@ -2,6 +2,7 @@ import com.ldtteam.structurize.blocks.interfaces.ILeveledBlueprintAnchorBlock; import com.ldtteam.structurize.blueprints.v1.Blueprint; +import com.ldtteam.structurize.placement.handlers.placement.PlacementHandlers; import com.ldtteam.structurize.storage.ISurvivalBlueprintHandler; import com.ldtteam.structurize.storage.StructurePacks; import com.ldtteam.structurize.util.PlacementSettings; @@ -39,9 +40,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.BlockSnapshot; -import net.minecraftforge.event.entity.EntityAttributeCreationEvent; import net.minecraftforge.event.level.BlockEvent; -import net.minecraftforge.event.level.BlockEvent.EntityPlaceEvent; import net.minecraftforge.items.wrapper.InvWrapper; import org.jetbrains.annotations.Nullable; @@ -168,6 +167,7 @@ public void handle( world.destroyBlock(blockPos, true); world.setBlockAndUpdate(blockPos, anchor); + PlacementHandlers.handleTileEntityPlacement(blueprint.getTileEntityData(blockPos, blueprint.getPrimaryBlockOffset()), world, blockPos); ((AbstractBlockHut) anchor.getBlock()).onBlockPlacedByBuildTool(world, blockPos, anchor,