From f48ee2858b846a7c43b8eab82c968ebf6d34bca9 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 20 Dec 2014 16:58:10 +0000 Subject: [PATCH] Fixed a crash with The Spectator and the Helpful Villagers mod. Closes #420 (blaze it) --- .../botania/common/item/equipment/bauble/ItemItemFinder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index cc5df2719..0ed64f319 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -150,9 +150,9 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } else if(e instanceof EntityVillager) { EntityVillager villager = (EntityVillager) e; ArrayList recipes = villager.getRecipes(player); - if(pstack != null) + if(pstack != null && recipes != null) for(MerchantRecipe recipe : recipes) - if(!recipe.isRecipeDisabled() && (equalStacks(pstack, recipe.getItemToBuy()) || equalStacks(pstack, recipe.getItemToSell()))) + if(recipe != null && !recipe.isRecipeDisabled() && (equalStacks(pstack, recipe.getItemToBuy()) || equalStacks(pstack, recipe.getItemToSell()))) positionsBuilder.append(villager.getEntityId()).append(";"); } else if(e instanceof EntityLivingBase) {