diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index 54f52614..0449c08d 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -431,9 +431,10 @@ public class BuildCraftBuilders extends BuildCraftMod { schemes.registerSchematicBlock(architectBlock, SchematicRotateMeta.class, new int[]{2, 5, 3, 4}, true); schemes.registerSchematicBlock(builderBlock, SchematicRotateMeta.class, new int[]{2, 5, 3, 4}, true); - schemes.registerSchematicBlock(markerBlock, SchematicWallSide.class); - schemes.registerSchematicBlock(pathMarkerBlock, SchematicWallSide.class); - schemes.registerSchematicBlock(constructionMarkerBlock, SchematicWallSide.class); + // Landmarks are often caught incorrectly, making building them counter-productive. + schemes.registerSchematicBlock(markerBlock, SchematicIgnore.class); + schemes.registerSchematicBlock(pathMarkerBlock, SchematicIgnore.class); + schemes.registerSchematicBlock(constructionMarkerBlock, SchematicIgnore.class); // Factories required to save entities in world diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java index d736e57b..fc4a6af0 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java @@ -500,9 +500,7 @@ public class BptBuilderBlueprint extends BptBuilderBase { FluidStack fluidStack = fluid != null ? FluidContainerRegistry.getFluidForFilledItem(invStk) : null; boolean compatibleContainer = fluidStack != null && fluidStack.getFluid() == fluid && fluidStack.amount >= FluidContainerRegistry.BUCKET_VOLUME; - if (invStk.hasTagCompound() == reqStk.hasTagCompound() && - (!invStk.hasTagCompound() || invStk.getTagCompound().equals(reqStk.getTagCompound())) && - (StackHelper.isCraftingEquivalent(reqStk, invStk, true) || compatibleContainer)) { + if (StackHelper.isMatchingItem(reqStk, invStk, true, true) || compatibleContainer) { try { stacksUsed.add(slot.useItem(context, reqStk, slotInv)); } catch (Throwable t) {