[12413] Fix client side InCombat state bug

(based on commit [12303] - a956123)