Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #2489, #2339

Browse source
This commit is contained in:
asiekierka 2015-02-24 13:23:04 +01:00
parent e7d588d28b
commit d6a750d437
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/buildcraft/BuildCraftBuilders.java
View file

@ -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

4
common/buildcraft/core/blueprints/BptBuilderBlueprint.java
View file

@ -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) {