fix cargo onDamage to be correct
Merge branch 'cargo_code_correct' #3261