Fixed stupid m_who bug

diff --git a/Changes b/Changes
index cca59387e68bbb08714004b67da0d74d9ba58fb0..18ec3d5c0d7e8616530182cd50a6aa37605c9e6f 100644 (file)
--- a/Changes
+++ b/Changes
@@ -695,3 +695,8 @@ Fixed exempt propagation bug
 ------------------------------------------------------
 Beta2 Released
 ------------------------------------------------------
+
+Fixed m_who bug displaying channels
+when it isn't supposed to, thanks to frozen
+--Luke
+===================================

diff --git a/src/s_user.c b/src/s_user.c
index 599097d7d55d1fe7e73508a6c141d227157e3bd8..4d6d383fa6c4fc7da5abb7a835f309a9e8ccd80d 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -2677,12 +2677,18 @@ int  m_who(cptr, sptr, parc, parv)
 #endif
                        for (lp = acptr->user->channel; lp; lp = lp->next)
                        {
+                               /* sptr not a member
+                                * not whoing oneself & acptr invisible
+                                */
                                if (!IsMember(sptr, lp->value.chptr) &&
                                    (acptr != sptr && IsInvisible(acptr)))
                                    continue;
 
+                               /* sptr is a member OR
+                                * acptr not invisible, and channel not +s/+p
+                                */
                                if (IsMember(sptr, lp->value.chptr) ||
-                                   !IsInvisible(acptr) && ShowChannel(sptr, lp->value.chptr))
+                                   !IsInvisible(acptr) && PubChannel(lp->value.chptr))
                                {
                                        g2g = 1;
                                        ch2ptr = lp->value.chptr;