Updated player spawning and city spawn