m_spanningtree Remove public TreeServer methods that are only called from TreeServer

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

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index edb6f6ef5b0b828d22828e72cb77d4eca6ec7508..9630128e0b1716865df4ba028d9c263e4d4355d7 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -148,6 +148,7 @@ class ModuleServicesAccount : public Module
  public:
        ModuleServicesAccount() : m1(this), m2(this), m3(this), m4(this), m5(this),
                accountname(this)
+               , checking_ban(false)
        {
        }
 
@@ -178,12 +179,7 @@ class ModuleServicesAccount : public Module
        {
                /* On nickchange, if they have +r, remove it */
                if (user->IsModeSet(m5) && assign(user->nick) != oldnick)
-               {
-                       std::vector<std::string> modechange;
-                       modechange.push_back(user->nick);
-                       modechange.push_back("-r");
-                       ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient, ModeParser::MODE_LOCALONLY);
-               }
+                       m5.RemoveMode(user);
        }
 
        ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE