Unified whip collision detection

still doesnt work.