Fix AttackCharge not picking a new target if the current became invalid
Merge pull request #6127 from cjshmyr/attackcharge

Fixes #5568