Merge pull request #495 from SaberUK/master+fix-libcpp

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

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index 9ed09274658aceff11fab4e93624d48435b0de36..c4eba1b2e4c79cdfbb858aa5a3646926007c48bd 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -32,7 +32,7 @@ class ModuleRestrictMsg : public Module
        void init()
        {
                Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
 
@@ -46,7 +46,7 @@ class ModuleRestrictMsg : public Module
                        // (1) the sender is opered
                        // (2) the recipient is opered
                        // anything else, blocked.
-                       if (IS_OPER(u) || IS_OPER(user))
+                       if (u->IsOper() || user->IsOper())
                        {
                                return MOD_RES_PASSTHRU;
                        }
@@ -63,10 +63,6 @@ class ModuleRestrictMsg : public Module
                return this->OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
 
-       virtual ~ModuleRestrictMsg()
-       {
-       }
-
        virtual Version GetVersion()
        {
                return Version("Forbids users from messaging each other. Users may still message opers and opers may message other opers.",VF_VENDOR);