* Improves spawn choice if undefined #1700 * Just a missing line <.< * Moves the checks into the "default" case