Re-built Collisions

Sets Player yVel to 0 if collisions is active along with solid and
non-solid blocks.