Moved canCombatDamageHappen logic to the main listener.