Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed #260 - Fluid material color null crash

Browse source
This commit is contained in:
Calclavia 2014-02-22 20:26:33 +08:00
parent a4fdf17a64
commit 6a5d2fe37b
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TileGrate.java
View file

@ -19,6 +19,7 @@ import calclavia.lib.utility.FluidUtility;
public class TileGrate extends TileAdvanced implements IFluidHandler, IDrain public class TileGrate extends TileAdvanced implements IFluidHandler, IDrain
{ {
public static final int MAX_FLUID_MODIFY_RATE = 50; public static final int MAX_FLUID_MODIFY_RATE = 50;
private long lastUseTime = 0; private long lastUseTime = 0;

13
src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java
View file

@ -58,14 +58,17 @@ public abstract class FluidNetwork extends NodeNetwork<IFluidNetwork, IFluidConn
{ {
this.tank = new FluidTank(0); 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(); this.reconstructTankInfo();

2
src/main/java/resonantinduction/core/resource/fluid/BlockFluidMaterial.java
View file

@ -50,7 +50,7 @@ public class BlockFluidMaterial extends BlockFluidFinite
@Override @Override
public int colorMultiplier(IBlockAccess access, int x, int y, int z) 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 @Override