Make liquid rendering more resilient. Render water if the liquid icon…

…s are missing.
SlimeKnights · Aug 21, 2014 · b03b1ac · b03b1ac
1 parent b75bb80
commit b03b1ac
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/java/tconstruct/client/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/BlockSkinRenderHelper.java
@@ -8,6 +8,7 @@
 import net.minecraft.init.Blocks;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.fluids.FluidRegistry;
 
 public class BlockSkinRenderHelper
 {
@@ -868,6 +869,10 @@ public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, int
             var8 = var11;
         }
 
+        // safety
+        if(stillIcon == null) stillIcon = FluidRegistry.WATER.getStillIcon();
+        if(flowingIcon == null) flowingIcon = FluidRegistry.WATER.getFlowingIcon();
+
         return Minecraft.isAmbientOcclusionEnabled() ? renderFakeBlockWithAmbientOcclusion(stillIcon, flowingIcon, x, y, z, var6, var7, var8, renderer, world) : renderFakeBlockWithColorMultiplier(
                 stillIcon, flowingIcon, x, y, z, var6, var7, var8, renderer, world);
     }