Unify player and non-player build logic; Remove collision detection