X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=b778c16ed4a143502b927fd73bb258013d432861;hb=4fc2f7199e964ba5112ecdb2613c6fd5c2eee638;hp=edb6f6ef5b0b828d22828e72cb77d4eca6ec7508;hpb=f62654a6859998f9d63eb22702c572d5ebcff15c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index edb6f6ef5..b778c16ed 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -106,7 +106,7 @@ class AccountExtItemImpl : public AccountExtItem
 {
  public:
 	AccountExtItemImpl(Module* mod)
-		: AccountExtItem("accountname", mod)
+		: AccountExtItem("accountname", ExtensionItem::EXT_USER, mod)
 	{
 	}
 
@@ -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