X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictmsg.cpp;h=c4eba1b2e4c79cdfbb858aa5a3646926007c48bd;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=9ed09274658aceff11fab4e93624d48435b0de36;hpb=ac7defcd3e52695dcf5e5150e9fe3e1624205e64;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index 9ed092746..c4eba1b2e 100644
--- 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);