CombatCtrl Changes for new code
This caused the target/untargeting bugs :)