make sure we arnt duplicating messages in some cases

[irc/evilnet/x3.git] / src / global.c

diff --git a/src/global.c b/src/global.c
index 716de9b080d7d5ddcb1ffde7477d19b6f96f2cda..cc05870e8d0c84a3e9f32472a8ca04390706f632 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -402,13 +402,17 @@ global_message_args(long targets, const char *language_entry, ...)
         if(message->flags & MESSAGE_RECIPIENT_OPERS && IsOper(luser)) {
             if(luser->uplink != self)
                 notice_target(luser->nick, message);
+
+            if ((message->flags & MESSAGE_RECIPIENT_LUSERS) || (message->flags & MESSAGE_RECIPIENT_HELPERS))
+                continue;
         }
 
         /* helpers */
         if (message->flags & MESSAGE_RECIPIENT_HELPERS && IsHelper(luser)) {
-            if (IsOper(luser))
-                continue;
            notice_target(luser->nick, message);
+
+            if (message->flags & MESSAGE_RECIPIENT_LUSERS)
+                continue;
        }
 
         /* users */