make sure we arnt duplicating messages in some cases

diff --git a/ChangeLog b/ChangeLog
index b223ee4287ddd5933af05f2457c2fd85915e57fd..e1fbae8dde21c2830f966a30f5628b665361b961 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 /***********************************************************************
  X3 ChangeLog
 
 /***********************************************************************
  X3 ChangeLog
 

+2006-08-01  Neil Spierling  <sirvulcan@gmail.com>
+
+       * src/global.c: Make sure we arnt sending duplicate messages in
+       some cases.
+

 2006-08-01  Neil Spierling  <sirvulcan@gmail.com>
 
        * src/x3.conf.example: Removed the targets option.
 2006-08-01  Neil Spierling  <sirvulcan@gmail.com>
 
        * src/x3.conf.example: Removed the targets option.

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_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)) {
         }
 
         /* helpers */
         if (message->flags & MESSAGE_RECIPIENT_HELPERS && IsHelper(luser)) {

-            if (IsOper(luser))
-                continue;

            notice_target(luser->nick, message);
            notice_target(luser->nick, message);

+
+            if (message->flags & MESSAGE_RECIPIENT_LUSERS)
+                continue;

        }
 
         /* users */
        }
 
         /* users */