From 4abe3e8807792208a382c0ce0f839f61ac578b3f Mon Sep 17 00:00:00 2001
From: AlgorithmX2 <AlgorithmX2@gmail.com>
Date: Wed, 7 May 2014 12:49:32 -0500
Subject: [PATCH] Fix Crash when adding trades when items are disabled.

---
 hooks/AETrading.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hooks/AETrading.java b/hooks/AETrading.java
index 2f3da4c86..a07a6ef32 100644
--- a/hooks/AETrading.java
+++ b/hooks/AETrading.java
@@ -42,6 +42,9 @@ public class AETrading implements IVillageTradeHandler
 
 	private void addMerchent(MerchantRecipeList list, ItemStack item, int emera, Random rand, int greed)
 	{
+		if ( item == null )
+			return;
+		
 		// Sell
 		ItemStack From = item.copy();
 		ItemStack To = new ItemStack( Items.emerald );