Fix light passing through oil and fuel

Some progress on #1843.