Updated isNPC check to use CombatTag API