Fixed #260 - Fluid material color null crash
This commit is contained in:
parent
a4fdf17a64
commit
6a5d2fe37b
3 changed files with 10 additions and 6 deletions
|
@ -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;
|
||||
|
|
|
@ -58,6 +58,8 @@ public abstract class FluidNetwork extends NodeNetwork<IFluidNetwork, IFluidConn
|
|||
{
|
||||
this.tank = new FluidTank(0);
|
||||
|
||||
synchronized (getConnectors())
|
||||
{
|
||||
for (IFluidConnector part : this.getConnectors())
|
||||
{
|
||||
if (part.getNetwork() instanceof IFluidNetwork)
|
||||
|
@ -67,6 +69,7 @@ public abstract class FluidNetwork extends NodeNetwork<IFluidNetwork, IFluidConn
|
|||
|
||||
this.reconstructConnector(part);
|
||||
}
|
||||
}
|
||||
|
||||
this.reconstructTankInfo();
|
||||
this.distributeConnectors();
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue