Merge pull request #1715 from yrsegal/master

Make the render color for camo blocks work with meta
This commit is contained in:
Jonathan Smith committed 2016-01-05 16:30:26 +00:00
commit d7f94bfc00
1 file changed
+1 -1
@@ -134,7 +134,7 @@ public abstract class BlockCamo extends BlockModContainer<TileCamo> {
TileCamo camo = (TileCamo) tile;
Block block = camo.camo;
if(block != null)
return block instanceof BlockCamo ? 0xFFFFFF : block.colorMultiplier(par1World, par2, par3, par4);
return block instanceof BlockCamo ? 0xFFFFFF : block.getRenderColor(camo.camoMeta);
}
return 0xFFFFFF;