m_spanningtree Remove duplicate code for sending channel messages from RouteCommand()

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

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index faeeb8b55c8b64d9ef43b9b993b8cdcc6020a01c..80bb73ad4989f785cf411c7d9f70240726a76a0a 100644 (file)
--- 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;
@@ -55,8 +53,6 @@ class ModuleOperjoin : public Module
                void init() CXX11_OVERRIDE
                {
                        OnRehash(NULL);
-                       Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-                       ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                }
 
 
@@ -83,7 +79,7 @@ class ModuleOperjoin : public Module
                                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);
                                        }