From 830dc497d6471c5507621c9f25a06d11c272ab30 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sun, 4 Dec 2016 03:30:35 +0100
Subject: [PATCH] Fixed Wrench clearing NBT data when reset causing problems
 with Morph O Tool, fixes #706

---
 CHANGELOG.md                                               | 1 +
 .../com/raoulvdberge/refinedstorage/item/ItemWrench.java   | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 981bbed8e..31e26480d 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### 1.3.2
 - Fixed being able to exceed max stack size while shift clicking (raoulvdberge)
+- Fixed Wrench clearing NBT data when reset causing problems with Morph O Tool (raoulvdberge)
 
 ### 1.3.1
 - Updated Forge to 2180 (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java
index 286813085..2d579e38c 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java
@@ -127,7 +127,12 @@ public class ItemWrench extends ItemBase {
 
             WrenchMode mode = WrenchMode.readFromNBT(stack.getTagCompound());
 
-            stack.setTagCompound(new NBTTagCompound());
+            if (stack.hasTagCompound()) {
+                stack.getTagCompound().removeTag(NBT_WRENCHED_TILE);
+                stack.getTagCompound().removeTag(NBT_WRENCHED_DATA);
+            } else {
+                stack.setTagCompound(new NBTTagCompound());
+            }
 
             WrenchMode next = mode.cycle();