From aa5915ed4e481082e5108a84d68049dcdcdf2ae3 Mon Sep 17 00:00:00 2001 From: SpaceToad Date: Tue, 8 Apr 2014 15:56:56 +0200 Subject: [PATCH] fixed template item selection --- common/buildcraft/builders/TileBuilder.java | 8 ++------ common/buildcraft/core/blueprints/BptBuilderTemplate.java | 4 ++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index cbf14e4e..22d988de 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -283,17 +283,13 @@ public class TileBuilder extends TileAbstractBuilder implements IMachine { bpt.transformToWorld(transform); - BptBuilderBase result = null; - if (items[0].getItem() instanceof ItemBlueprintStandard) { - result = new BptBuilderBlueprint((Blueprint) bpt, worldObj, x, y, z); + return new BptBuilderBlueprint((Blueprint) bpt, worldObj, x, y, z); } else if (items[0].getItem() instanceof ItemBlueprintTemplate) { return new BptBuilderTemplate(bpt, worldObj, x, y, z); } else { - result = null; + return null; } - - return result; } public void iterateBpt() { diff --git a/common/buildcraft/core/blueprints/BptBuilderTemplate.java b/common/buildcraft/core/blueprints/BptBuilderTemplate.java index 498fd93f..42daebb3 100644 --- a/common/buildcraft/core/blueprints/BptBuilderTemplate.java +++ b/common/buildcraft/core/blueprints/BptBuilderTemplate.java @@ -110,6 +110,10 @@ public class BptBuilderTemplate extends BptBuilderBase { IInvSlot firstSlotToConsume = null; for (IInvSlot invSlot : InventoryIterator.getIterable(builder, ForgeDirection.UNKNOWN)) { + if (!builder.isBuildingMaterialSlot(invSlot.getIndex())) { + continue; + } + ItemStack stack = invSlot.getStackInSlot(); if (stack != null && stack.stackSize > 0) {