From 4455dc3f62cdce41d4e1ec503e408732bf498e7d Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Tue, 14 Feb 2017 19:33:19 +0100
Subject: [PATCH] Fixed Wrench in Dismantling Mode voiding Storage Block
 contents

---
 CHANGELOG.md                                          |  3 ++-
 .../raoulvdberge/refinedstorage/item/ItemWrench.java  | 11 +++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b9755c24..17a7ad1e3 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,11 @@
 
 ### 1.4.1
 - Added Storage Monitor (raoulvdberge)
-- Fixed Processing Pattern Encoder and Reader recipes not supporting oredict workbench and chest (VT-14)
+- Fixed Processing Pattern Encoder and Security Manager recipes not supporting oredict workbench and chest (VT-14)
 - Fixed network nodes not saving correctly (raoulvdberge)
 - Fixed network nodes not respecting redstone mode (raoulvdberge)
 - Fixed "Clear" and "Create Pattern" buttons not working correctly when using Grid Filter tabs (raoulvdberge)
+- Fixed Wrench in Dismantling Mode voiding Storage Block contents (raoulvdberge)
 
 ### 1.4
 - Added Security Manager (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java
index f9858d9ce..02dead378 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java
@@ -129,13 +129,12 @@ public class ItemWrench extends ItemBase {
 
                 ((TileNode) tile).writeConfiguration(data);
 
-                ItemStack tileStack = new ItemStack(
-                    state.getBlock(),
-                    1,
-                    state.getBlock().getMetaFromState(state)
-                );
+                ItemStack tileStack = state.getBlock().getDrops(world, pos, state, 0).get(0);
+
+                if (!tileStack.hasTagCompound()) {
+                    tileStack.setTagCompound(new NBTTagCompound());
+                }
 
-                tileStack.setTagCompound(new NBTTagCompound());
                 tileStack.getTagCompound().setTag(BlockNode.NBT_REFINED_STORAGE_DATA, data);
 
                 world.setBlockToAir(pos);