Temporary fix for SpawnPlayerSafely

Couldn't figure out how to make SpawnPlayerSafely's existing structure
to play nice, so I commented it out for now and put in some more basic
code that does the job in a slightly different way. We can use that for
the time being.