Update to setting world spawn

I have not tested it fully but the logic is there.