From: sirvulcan <redacted>
Date: Tue, 1 Aug 2006 03:23:18 +0000 (+0000)
Subject: make sure we arnt duplicating messages in some cases
X-Git-Tag: 1.9~477
X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/commitdiff_plain/4d99495c83df6a2bb0a0323eee599c5a7246c212?ds=sidebyside

make sure we arnt duplicating messages in some cases
---

diff --git a/ChangeLog b/ChangeLog
index b223ee4..e1fbae8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 /***********************************************************************
  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.
diff --git a/src/global.c b/src/global.c
index 716de9b..cc05870 100644
--- 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 */