Merge pull request #784 from viliml/patch-1

Prevent NPE in fluid lookup for block
This commit is contained in:
cpw committed 2013-09-14 11:28:06 -07:00
commit 55830256d3
1 file changed
+1 -1
@@ -1,4 +1,3 @@
package net.minecraftforge.fluids;
import java.util.HashMap;
@@ -133,6 +132,7 @@ public abstract class FluidRegistry
{
if (fluidBlocks == null)
{
fluidBlocks = new BiMap<Block, Fluid>();
for (Fluid fluid : fluids.values())
{
if (fluid.canBePlacedInWorld() && Block.blocksList[fluid.getBlockID()] != null)