Move water/lava flow flags to a separate listener.
Move obsidian generator detector to a separate listener.
Fix incorrect condition with water/lava flow flags.