diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index f1340bc1..32dfb71d 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -10,7 +10,8 @@ Changes Bugs - Fixed Transceivers losing items when single player worlds reloaded without restarting MC - More than one stack of quartz can now be placed in alloy smelter when making fused quartz -- #1150 Crash when Farming Station Error trying to plant Pam's Mob Seeds (nb, they dont work, but it wont crash) +- #1150 Crash when Farming Station Error trying to plant Pam's Mob Seeds (nb, they don't work, but it wont crash) +- #1153 Item conduits crash with invalid item stacks (one without an item assigned) ------------------------------------------------------ Version 2.1.6 diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java index 5b012609..25779f22 100644 --- a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java +++ b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java @@ -171,7 +171,7 @@ public class NetworkedInventory { } private boolean doTransfer(ItemStack extractedItem, int slot, int maxExtract) { - if(extractedItem == null) { + if(extractedItem == null || extractedItem.getItem() == null) { return false; } ItemStack toExtract = extractedItem.copy();