Fix for #1547 and #1549

On initial spawn players are allowed to collide. This will fix that.