Some Bug Fixes

1.This fixes the issue of not being able to light cigarettes/cigars with flares/torches.
Fixes #4108