Only send ACCOUNT and CHGHOST to clients that have sent NICK/USER.

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

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 1f2fe745531f9e4a7463b790a9c3e37f7b0b2141..ceb1b66fa28eb83830d77e799ba68df1fe5f778f 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -25,12 +25,6 @@
 class ModuleModesOnConnect : public Module
 {
  public:
-       void Prioritize() CXX11_OVERRIDE
-       {
-               // for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t
-               ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR);
@@ -38,10 +32,6 @@ class ModuleModesOnConnect : public Module
 
        void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
        {
-               // Backup and zero out the disabled usermodes, so that we can override them here.
-               const std::bitset<64> save = ServerInstance->Config->DisabledUModes;
-               ServerInstance->Config->DisabledUModes.reset();
-
                ConfigTag* tag = user->MyClass->config;
                std::string ThisModes = tag->getString("modes");
                if (!ThisModes.empty())
@@ -58,8 +48,6 @@ class ModuleModesOnConnect : public Module
 
                        ServerInstance->Parser.CallHandler("MODE", modes, user);
                }
-
-               ServerInstance->Config->DisabledUModes = save;
        }
 };