Collision fix for CPlayer

Now correctly accounts for offset when player and a solid collides.