Don't allow units to enter combat upon death

Closes #10275