Merge pull request Mithion#1234 from DoomFruit/ArcaneDeconstructorFix

Fix for issue Mithion#1199
DoomFruit · Sep 12, 2015 · d2a5a9a · d2a5a9a
2 parents d57cec4 + 4e4e93a
commit d2a5a9a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/am2/blocks/tileentities/TileEntityArcaneDeconstructor.java b/src/main/java/am2/blocks/tileentities/TileEntityArcaneDeconstructor.java
@@ -96,8 +96,10 @@ public void updateEntity(){
 							}
 						}else{
 							if (current_deconstruction_time++ >= DECONSTRUCTION_TIME){
-								for (ItemStack stack : deconstructionRecipe){
-									transferOrEjectItem(stack);
+							        if(getDeconstructionRecipe() == true){
+									for (ItemStack stack : deconstructionRecipe){
+										transferOrEjectItem(stack);
+									}
 								}
 								deconstructionRecipe = null;
 								decrStackSize(0, 1);
@@ -200,7 +202,7 @@ private boolean getDeconstructionRecipe(){
 
 				for (Object o : recipeParts){
 					ItemStack stack = objectToItemStack(o);
-					if (stack != null){
+					if (stack != null && !stack.getItem().hasContainerItem(stack)){
 						stack.stackSize = 1;
 						recipeItems.add(stack.copy());
 					}