Cacti on beaches

Added a check so that cacti only spawn in desert variants.
I may look into separating the foliage finishers, but thought it would help to finish the check for cacti.
resolves #1629