Merge branch 'master' into development

2015-02-19 16:53:15 -05:00 · 2015-02-19 16:53:15 -05:00 · a9a506fe4a
parent 3935fa74c1 1e78cbf60e
commit a9a506fe4a
1 changed files with 1 additions and 1 deletions
--- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
+++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
@ -170,7 +170,7 @@ public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork>
 			{
 				if(!stack.initiatedPath)
 				{
-					if(!recalculate(stack, null))
+					if(stack.itemStack == null || !recalculate(stack, null))
 					{
 						remove.add(stack);
 						continue;