Refactored respawn code some more. Fixes #637

* Fixed bed spawns not being used when location wasn't null.
* Fixed broken respawns caused by previous commit.