X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=80bb73ad4989f785cf411c7d9f70240726a76a0a;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=864515e0c9aab36ac43af78390bb8b1e053be4f7;hpb=b98acac5c91ecb08da28d70185818a19991eb1db;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 864515e0c..80bb73ad4 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -24,8 +24,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
-
 class ModuleOperjoin : public Module
 {
 		std::string operChan;
@@ -52,15 +50,13 @@ class ModuleOperjoin : public Module
 		}
 
 	public:
-		void init()
+		void init() CXX11_OVERRIDE
 		{
 			OnRehash(NULL);
-			Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-			ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		}
 
 
-		virtual void OnRehash(User* user)
+		void OnRehash(User* user) CXX11_OVERRIDE
 		{
 			ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin");
 
@@ -71,19 +67,19 @@ class ModuleOperjoin : public Module
 				tokenize(operChan,operChans);
 		}
 
-		virtual Version GetVersion()
+		Version GetVersion() CXX11_OVERRIDE
 		{
 			return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR);
 		}
 
-		virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
+		void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
 		{
 			LocalUser* localuser = IS_LOCAL(user);
 			if (!localuser)
 				return;
 
 			for (std::vector<std::string>::const_iterator i = operChans.begin(); i != operChans.end(); ++i)
-				if (ServerInstance->IsChannel(*i, ServerInstance->Config->Limits.ChanMax))
+				if (ServerInstance->IsChannel(*i))
 					Channel::JoinUser(localuser, *i, override);
 
 			std::string chanList = localuser->oper->getConfig("autojoin");
@@ -93,7 +89,7 @@ class ModuleOperjoin : public Module
 				tokenize(chanList, typechans);
 				for (std::vector<std::string>::const_iterator it = typechans.begin(); it != typechans.end(); ++it)
 				{
-					if (ServerInstance->IsChannel(*it, ServerInstance->Config->Limits.ChanMax))
+					if (ServerInstance->IsChannel(*it))
 					{
 						Channel::JoinUser(localuser, *it, override);
 					}