Working version (reverted optimization and Ignitor changes)

I reverted some changes by @thijser for optimization and reverted the `Ignitor` to an earlier version.

This fixes the issue of trees not being set on fire. The  Ignitor  version change was necessary to be able to extinguish fires.