[Bug] Damage bonuses for cantrips also apply to non-spells where there is a spell attack roll

[Pjb518]

I have a bonus to damage to cantrips that is also applying to spell attack rolls for other features that are not spells. I think this is because the spell level is being detected as 0 in this case. If cantrip is selected, it should not be applying to these other rolls.