From 51daaf498ce104bade88672aec1a776a65f77c43 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Sun, 26 Feb 2017 19:38:59 +0100
Subject: [PATCH] Better legacy tag check

---
 .../refinedstorage/block/BlockNode.java         | 15 +++++++++------
 .../refinedstorage/tile/TileNode.java           | 17 +++++++++++++----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java
index 9457b8605..be2e2b27f 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java
@@ -50,16 +50,19 @@ public abstract class BlockNode extends BlockBase {
     public void breakBlock(World world, BlockPos pos, IBlockState state) {
         super.breakBlock(world, pos, state);
 
-        INetworkNodeManager manager = API.instance().getNetworkNodeManager(world.provider.getDimension());
+        // Sanity check
+        if (world.getBlockState(pos).getBlock() == this) {
+            INetworkNodeManager manager = API.instance().getNetworkNodeManager(world.provider.getDimension());
 
-        INetworkNode node = manager.getNode(pos);
+            INetworkNode node = manager.getNode(pos);
 
-        manager.removeNode(pos, true);
+            manager.removeNode(pos, true);
 
-        API.instance().markNetworkNodesDirty(world);
+            API.instance().markNetworkNodesDirty(world);
 
-        if (node.getNetwork() != null) {
-            node.getNetwork().getNodeGraph().rebuild();
+            if (node.getNetwork() != null) {
+                node.getNetwork().getNodeGraph().rebuild();
+            }
         }
     }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
index 3caeb179a..fa78234a2 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
@@ -82,10 +82,19 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
     public void read(NBTTagCompound tag) {
         super.read(tag);
 
-        // If we have more than this stored:
-        // x, y, z, id, Direction
-        // Then this is a legacy tag!
-        if (tag.getSize() > 5) {
+        // Ugly code for checking if this is a legacy tile. Sue me.
+        boolean hasMeta = tag.hasKey("x") && tag.hasKey("y") && tag.hasKey("z") && tag.hasKey("id");
+        boolean hasForgeData = tag.hasKey("ForgeData");
+        boolean hasForgeCaps = tag.hasKey("ForgeCaps");
+
+        // + 1 because of "Direction".
+        if (tag.getSize() == 4 + 1 && hasMeta) {
+            // NO OP
+        } else if (tag.getSize() == 5 + 1 && hasMeta && (hasForgeData || hasForgeCaps)) {
+            // NO OP
+        } else if (tag.getSize() == 6 + 1 && hasMeta && hasForgeData && hasForgeCaps) {
+            // NO OP
+        } else {
             legacyTagToRead = tag;
         }
     }