From bed5c26f4b0665af8b04e0735f52aa0672882a6d Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Fri, 20 May 2016 21:03:10 +0200
Subject: [PATCH] Fix too much machines being added to machine list

---
 .../refinedstorage/RefinedStorageUtils.java    |  8 --------
 .../refinedstorage/tile/TileController.java    |  1 -
 .../java/refinedstorage/tile/TileMachine.java  | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/main/java/refinedstorage/RefinedStorageUtils.java b/src/main/java/refinedstorage/RefinedStorageUtils.java
index b22b612ae..670be26b3 100755
--- a/src/main/java/refinedstorage/RefinedStorageUtils.java
+++ b/src/main/java/refinedstorage/RefinedStorageUtils.java
@@ -10,8 +10,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
-import net.minecraftforge.fml.common.network.NetworkRegistry;
-import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import refinedstorage.inventory.InventorySimple;
 import refinedstorage.item.ItemUpgrade;
 
@@ -303,12 +301,6 @@ public class RefinedStorageUtils {
         }
     }
 
-    public static void sendToAllAround(World world, BlockPos pos, IMessage message) {
-        NetworkRegistry.TargetPoint target = new NetworkRegistry.TargetPoint(world.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), 64);
-
-        RefinedStorage.NETWORK.sendToAllAround(message, target);
-    }
-
     public static void updateBlock(World world, BlockPos pos) {
         world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 1 | 2);
     }
diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java
index c3976a253..035c42355 100755
--- a/src/main/java/refinedstorage/tile/TileController.java
+++ b/src/main/java/refinedstorage/tile/TileController.java
@@ -111,7 +111,6 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
         super.update();
 
         if (!worldObj.isRemote) {
-            // Prevent cache from re-adding the block
             for (TileMachine machine : machinesToAdd) {
                 if (!machines.contains(machine)) {
                     machines.add(machine);
diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java
index 35da2942f..5ff0caccd 100755
--- a/src/main/java/refinedstorage/tile/TileMachine.java
+++ b/src/main/java/refinedstorage/tile/TileMachine.java
@@ -171,4 +171,22 @@ public abstract class TileMachine extends TileBase implements ISynchronizedConta
     public abstract int getEnergyUsage();
 
     public abstract void updateMachine();
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        if (!(other instanceof TileMachine)) {
+            return false;
+        }
+
+        return ((TileMachine) other).getPos().equals(pos);
+    }
+
+    @Override
+    public int hashCode() {
+        return pos.hashCode();
+    }
 }