From f53d6593c13082eaba9553265cc43fbd77fbb760 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Mon, 4 Apr 2016 17:51:21 +0200
Subject: [PATCH] Only send item updates if is active

---
 .../refinedstorage/gui/GuiController.java     |  2 +-
 .../refinedstorage/tile/TileController.java   | 19 ++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java
index 60a765960..49bd16de0 100755
--- a/src/main/java/refinedstorage/gui/GuiController.java
+++ b/src/main/java/refinedstorage/gui/GuiController.java
@@ -119,7 +119,7 @@ public class GuiController extends GuiBase {
         }
 
         if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) {
-            String message = t("misc.refinedstorage:energy_usage", controller.isActiveClientSide() ? controller.getEnergyUsage() : 0);
+            String message = t("misc.refinedstorage:energy_usage", controller.getEnergyUsage());
             message += "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null));
 
             drawTooltip(mouseX, mouseY, message);
diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java
index 5fa51db89..9e153a9fe 100755
--- a/src/main/java/refinedstorage/tile/TileController.java
+++ b/src/main/java/refinedstorage/tile/TileController.java
@@ -12,8 +12,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageBlocks;
 import refinedstorage.RefinedStorageGui;
@@ -52,9 +50,6 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
 
     private boolean destroyed = false;
 
-    @SideOnly(Side.CLIENT)
-    private boolean activeClientSide;
-
     @Override
     public void update() {
         super.update();
@@ -135,7 +130,9 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
                 if (!InventoryUtils.compareStack(consumer.getWirelessGrid(), consumer.getPlayer().getHeldItem(consumer.getHand()))) {
                     consumer.getPlayer().closeScreen(); // This will call onContainerClosed on the Container and remove it from the list
                 } else {
-                    RefinedStorage.NETWORK.sendTo(new MessageWirelessGridItems(itemGroups), (EntityPlayerMP) consumer.getPlayer());
+                    if (isActive()) {
+                        RefinedStorage.NETWORK.sendTo(new MessageWirelessGridItems(itemGroups), (EntityPlayerMP) consumer.getPlayer());
+                    }
                 }
             }
 
@@ -404,8 +401,6 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
     public void receiveData(ByteBuf buf) {
         int lastEnergy = energy.getEnergyStored();
 
-        activeClientSide = buf.readBoolean();
-
         energy.setEnergyStored(buf.readInt());
 
         if (lastEnergy != energy.getEnergyStored()) {
@@ -415,8 +410,6 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
 
     @Override
     public void sendData(ByteBuf buf) {
-        buf.writeBoolean(isActive());
-
         buf.writeInt(energy.getEnergyStored());
     }
 
@@ -441,7 +434,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
 
     @Override
     public void sendContainerData(ByteBuf buf) {
-        buf.writeInt(energyUsage);
+        buf.writeInt(isActive() ? energyUsage : 0);
 
         buf.writeInt(redstoneMode.id);
 
@@ -454,10 +447,6 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
         }
     }
 
-    public boolean isActiveClientSide() {
-        return activeClientSide;
-    }
-
     @Override
     public Class<? extends Container> getContainer() {
         return ContainerController.class;