Fix individual combat when attacked

In particular, better handle melee units attacking capturing units.

Reviewed By: wraitii

Patch By: temple

Differential Revision: https://code.wildfiregames.com/D1047