Fix plum tree -> apple sapling

Rewrote a bit of the fruit tree code so that things the generation and sapling logic is easier to follow, and also correct.
Unfortunately, this will only work on trees generated after this fix.