Handle client collision state correctly