From 15442d86035e246f020e49e62ec17b1004353b97 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 14 Oct 2016 22:57:44 +0200 Subject: [PATCH] Update changelog --- CHANGELOG.md | 1 + src/main/java/refinedstorage/tile/TileDestructor.java | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 701e60d8e..9d7853192 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Added config option to configure RS to EU conversion rates (InusualZ) - Added ability to toggle between read and write, read and write mode in storage blocks (InusualZ, raoulvdberge) - The Constructor can now drop items in the world (raoulvdberge) +- The Destructor can now pick up items in the world (InusualZ) - Stack upgrade in Importer / Exporter in fluid mode and Fluid Interface now transfers 64 buckets at once (raoulvdberge) - Detector without any filter will detect based on total items or fluids stored (raoulvdberge) - Fixed resetting a stack of patterns yields 1 blank pattern (raoulvdberge) diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java index d1572b01e..2303b7ef9 100755 --- a/src/main/java/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/refinedstorage/tile/TileDestructor.java @@ -7,7 +7,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataSerializers; @@ -108,11 +107,11 @@ public class TileDestructor extends TileMultipartNode implements IComparable, IF for (Entity entity : droppedItems) { if (entity instanceof EntityItem) { ItemStack droppedItem = ((EntityItem) entity).getEntityItem(); - if (IFilterable.canTake(itemFilters, mode, compare, droppedItem)) { - if (network.insertItem(droppedItem, droppedItem.stackSize, true) == null) { - network.insertItem(droppedItem.copy(), droppedItem.stackSize, false); - worldObj.removeEntity(entity); - } + + if (IFilterable.canTake(itemFilters, mode, compare, droppedItem) && network.insertItem(droppedItem, droppedItem.stackSize, true) == null) { + network.insertItem(droppedItem.copy(), droppedItem.stackSize, false); + + worldObj.removeEntity(entity); break; }