Reordered some spawnpoint code to hopefully make initial worldgen a bit faster