- if (cf->func && !pd->is_notice
- && (GetUserMode(cn, cf->service) && !IsDeaf(cf->service)))
- cf->func(pd->user, cn, pd->text+1, cf->service);
+ /* Never send a NOTICE to a channel to one of the services */
+ if (!pd->is_notice && cf->func
+ && ((cn->modes & MODE_REGISTERED) || GetUserMode(cn, cf->service)))