From 9bc010590270553ebac6beb6521377f49c92ac52 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 16 Mar 2015 17:29:58 +0000 Subject: [PATCH] Fixed a crash when crafting with a bauble that has a cosmetic override. Closes #649 --- .../common/crafting/recipe/CosmeticRemoveRecipe.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java index 68347ebf3..af26d305f 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java @@ -26,12 +26,9 @@ public class CosmeticRemoveRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); if(stack != null) { - if(!foundAttachable) { - if(stack.getItem() instanceof ICosmeticAttachable && !(stack.getItem() instanceof ICosmeticBauble) && ((ICosmeticAttachable) stack.getItem()).getCosmeticItem(stack) != null) { - foundAttachable = true; - break; - } else return false; - } + if(stack.getItem() instanceof ICosmeticAttachable && !(stack.getItem() instanceof ICosmeticBauble) && ((ICosmeticAttachable) stack.getItem()).getCosmeticItem(stack) != null) + foundAttachable = true; + else return false; } }