Merge pull request #1337 from SaberUK/master+merge

[user/henk/code/inspircd.git] / src / modules / m_deaf.cpp

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index fd9b322c0cf947ff1a34518f63b47c6383757774..88919e91b072540184fe3637360109fd95537bf1 100644 (file)
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -73,7 +73,7 @@ class ModuleDeaf : public Module
                 * If we have no bypasschars_uline in config, and this is a bypasschar (regular)
                 * Than it is obviously going to get through +d, no build required
                 */
-               if (!deaf_bypasschars_uline.empty() && is_bypasschar)
+               if (deaf_bypasschars_uline.empty() && is_bypasschar)
                        return MOD_RES_PASSTHRU;
 
                const Channel::MemberMap& ulist = chan->GetUsers();
@@ -94,9 +94,6 @@ class ModuleDeaf : public Module
                        if (is_bypasschar && !is_a_uline)
                                continue; /* deliver message */
 
-                       if (status && !strchr(i->second->GetAllPrefixChars(), status))
-                               continue;
-
                        /* don't deliver message! */
                        exempt_list.insert(i->first);
                }