From 6a5d2fe37bb4e315d29379a977a23ab8cffe0a39 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Sat, 22 Feb 2014 20:26:33 +0800
Subject: [PATCH] Fixed #260 - Fluid material color null crash

---
 .../mechanical/fluid/transport/TileGrate.java       |  1 +
 .../core/prefab/fluid/FluidNetwork.java             | 13 ++++++++-----
 .../core/resource/fluid/BlockFluidMaterial.java     |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TileGrate.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TileGrate.java
index ca9addcf..ee405cd5 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TileGrate.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TileGrate.java
@@ -19,6 +19,7 @@ import calclavia.lib.utility.FluidUtility;
 
 public class TileGrate extends TileAdvanced implements IFluidHandler, IDrain
 {
+	
 	public static final int MAX_FLUID_MODIFY_RATE = 50;
 
 	private long lastUseTime = 0;
diff --git a/src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java b/src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java
index f28c2220..efce2add 100644
--- a/src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java
+++ b/src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java
@@ -58,14 +58,17 @@ public abstract class FluidNetwork extends NodeNetwork<IFluidNetwork, IFluidConn
 	{
 		this.tank = new FluidTank(0);
 
-		for (IFluidConnector part : this.getConnectors())
+		synchronized (getConnectors())
 		{
-			if (part.getNetwork() instanceof IFluidNetwork)
+			for (IFluidConnector part : this.getConnectors())
 			{
-				part.setNetwork(this);
-			}
+				if (part.getNetwork() instanceof IFluidNetwork)
+				{
+					part.setNetwork(this);
+				}
 
-			this.reconstructConnector(part);
+				this.reconstructConnector(part);
+			}
 		}
 
 		this.reconstructTankInfo();
diff --git a/src/main/java/resonantinduction/core/resource/fluid/BlockFluidMaterial.java b/src/main/java/resonantinduction/core/resource/fluid/BlockFluidMaterial.java
index 97365184..24574b45 100644
--- a/src/main/java/resonantinduction/core/resource/fluid/BlockFluidMaterial.java
+++ b/src/main/java/resonantinduction/core/resource/fluid/BlockFluidMaterial.java
@@ -50,7 +50,7 @@ public class BlockFluidMaterial extends BlockFluidFinite
 	@Override
 	public int colorMultiplier(IBlockAccess access, int x, int y, int z)
 	{
-		return ResourceGenerator.materialColors.get(getFluid().getName().replace("molten", "").toLowerCase());
+		return ResourceGenerator.getColor(getFluid().getName().replace("molten", "").toLowerCase());
 	}
 
 	@Override