Get rid of the OnRemoteKill hook, make use of GetRouting() and TR_CUSTOM to route...

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

diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index 113e49dffa48b0172830dbab53a340ba8c9baf57..bfac8147d76e2f66db164b3ef6af90078911cecc 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -27,7 +27,7 @@
 class ModuleConnJoin : public Module
 {
        public:
-               void init()
+               void init() CXX11_OVERRIDE
                {
                        Implementation eventlist[] = { I_OnPostConnect };
                        ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
@@ -38,12 +38,12 @@ class ModuleConnJoin : public Module
                        ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_LAST);
                }
 
-               Version GetVersion()
+               Version GetVersion() CXX11_OVERRIDE
                {
                        return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR);
                }
 
-               void OnPostConnect(User* user)
+               void OnPostConnect(User* user) CXX11_OVERRIDE
                {
                        LocalUser* localuser = IS_LOCAL(user);
                        if (!localuser)
@@ -57,7 +57,7 @@ class ModuleConnJoin : public Module
 
                        while (chans.GetToken(chan))
                        {
-                               if (ServerInstance->IsChannel(chan, ServerInstance->Config->Limits.ChanMax))
+                               if (ServerInstance->IsChannel(chan))
                                        Channel::JoinUser(localuser, chan);
                        }
                }