From 0317f81e06ed9982ccc0da68c20d906b39a8b885 Mon Sep 17 00:00:00 2001
From: Aidan Brady <aidancbrady@aol.com>
Date: Wed, 18 Dec 2013 07:24:59 -0500
Subject: [PATCH] Attempt to fix client render

---
 common/mekanism/common/FluidNetwork.java | 27 +++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/common/mekanism/common/FluidNetwork.java b/common/mekanism/common/FluidNetwork.java
index 5e29d0958..f6a3582f6 100644
--- a/common/mekanism/common/FluidNetwork.java
+++ b/common/mekanism/common/FluidNetwork.java
@@ -58,7 +58,6 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
 			{
 				if(net.refFluid != null && net.fluidScale > fluidScale)
 				{
-					fluidScale = net.fluidScale;
 					refFluid = net.refFluid;
 					net.fluidScale = 0;
 					net.refFluid = null;
@@ -82,15 +81,27 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
 			}
 		}
 		
+    	if(FMLCommonHandler.instance().getEffectiveSide().isClient())
+    	{
+    		System.out.println("hi");
+    	}
+		
+		fluidScale = getScale();
+		
 		refresh();
 		register();
 	}
 	
     @Override
     public void onNetworksCreated(List<FluidNetwork> networks)
-    {
+    {    	
 		if(fluidStored != null)
 		{
+	    	if(FMLCommonHandler.instance().getEffectiveSide().isClient())
+	    	{
+	    		System.out.println("hi");
+	    	}
+	    	
 	    	int[] caps = new int[networks.size()];
 	    	int cap = 0;
 	    	
@@ -111,6 +122,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
 	    		if(values[index] > 0)
 	    		{
 	    			network.fluidStored = new FluidStack(fluidStored.getFluid(), values[index]);
+	    			network.fluidScale = network.getScale();
 	    			network.refFluid = fluidStored.getFluid();
 	    		}
 	    	}
@@ -208,6 +220,8 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
 			
 			int stored = fluidStored != null ? fluidStored.amount : 0;
 			
+			System.out.println("SERVER " + getScale() + " " + stored);
+			
 			if(stored != prevStored)
 			{
 				needsUpdate = true;
@@ -240,6 +254,8 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
 	{
 		super.clientTick();
 		
+		System.out.println("CLIENT " + getScale() + " " + getFlow());
+		
 		fluidScale = Math.max(fluidScale, getScale());
 		
 		if(didTransfer && fluidScale < 1)
@@ -362,7 +378,6 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
 	protected FluidNetwork create(ITransmitter<FluidNetwork>... varTransmitters) 
 	{
 		FluidNetwork network = new FluidNetwork(varTransmitters);
-		network.fluidScale = fluidScale;
 		network.refFluid = refFluid;
 		
 		if(fluidStored != null)
@@ -376,6 +391,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
 			}
 		}
 		
+		network.fluidScale = network.getScale();
 		fluidScale = 0;
 		refFluid = null;
 		fluidStored = null;
@@ -387,10 +403,9 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
 	protected FluidNetwork create(Collection<ITransmitter<FluidNetwork>> collection) 
 	{
 		FluidNetwork network = new FluidNetwork(collection);
-		network.fluidScale = fluidScale;
 		network.refFluid = refFluid;
 		
-		if(fluidStored != null)
+		if(fluidStored != null && FMLCommonHandler.instance().getEffectiveSide().isServer())
 		{
 			if(network.fluidStored == null)
 			{
@@ -401,6 +416,8 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
 			}
 		}
 		
+		network.fluidScale = network.getScale();
+		
 		return network;
 	}