Merge branch 'rv1' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

2014-07-24 22:48:06 -05:00
parent 9223f724bf 6ef95e0586
commit 0244bb943f
5 changed files with 41 additions and 70 deletions
@@ -27,7 +27,8 @@ public class SlotDisconnected extends AppEngSlot
 			{
 				ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem();
 				ItemStack out = iep.getOutput( is );
-				return out;
+				if ( out != null )
+					return out;
 			}
 		}
 		return super.getStack();