From 313ec95dcd7966166a290c7d009a68515f457154 Mon Sep 17 00:00:00 2001 From: codemastr Date: Wed, 20 Dec 2000 17:47:02 +0000 Subject: [PATCH] Fixed a bug where you would receive a double notice on /who 0 o --- Changes | 1 + src/s_user.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index bb6119aa7..c18b7b5bb 100644 --- a/Changes +++ b/Changes @@ -37,3 +37,4 @@ - Removed some irc.flirt.org references. - Made it so if a channel is +O or +A and you are not +O or +A and not in the channel, you can not /topic #channel same for +b if not +o or on the channel. Suggested by Sysop_Mars +- Fixed a bug where you would receive a double notice when someone does a /who 0 o diff --git a/src/s_user.c b/src/s_user.c index 8e2e866e2..1a5349dda 100644 --- a/src/s_user.c +++ b/src/s_user.c @@ -2432,7 +2432,7 @@ int m_notice(cptr, sptr, parc, parv) } int channelwho = 0; - +int operwho = 0; static void do_who(sptr, acptr, repchan) aClient *sptr, *acptr; aChannel *repchan; @@ -2462,7 +2462,7 @@ static void do_who(sptr, acptr, repchan) else if (repchan && has_voice(acptr, repchan)) status[i++] = '+'; status[i] = '\0'; - if (IsWhois(acptr) && channelwho == 0 && sptr != acptr) + if (IsWhois(acptr) && channelwho == 0 && sptr != acptr && !operwho) { sendto_one(acptr, ":%s NOTICE %s :*** %s either did a /who or a specific /who on you", @@ -2510,11 +2510,13 @@ int m_who(cptr, sptr, parc, parv) clean_channelname(mask); } channelwho = 0; + operwho = 0; mychannel = NullChn; if (oper) { sendto_umode(UMODE_HELPOP, "*** HelpOp -- from %s: [Did a /who 0 o]", parv[0]); sendto_serv_butone(&me, ":%s HELP :[Did a /who 0 o]", parv[0]); + operwho = 1; } if (sptr->user) if ((lp = sptr->user->channel))