X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=77a7377c6527e7f8a67f8636e1b4d72aa988926e;hb=de69e28a4a1aea89e410b693bbbb67890ecb0bd3;hp=58bacb7c8e7aa4ed7d664d0afbd7f574f3449358;hpb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 58bacb7c8..77a7377c6 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -27,7 +27,7 @@ class Channel_r : public ModeHandler
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		// only a u-lined server may add or remove the +r mode.
-		if (IS_REMOTE(source) || ServerInstance->ULine(source->nick.c_str()) || ServerInstance->ULine(source->server))
+		if (!IS_LOCAL(source) || ServerInstance->ULine(source->nick.c_str()) || ServerInstance->ULine(source->server))
 		{
 			// Only change the mode if it's not redundant
 			if ((adding && !channel->IsModeSet('r')) || (!adding && channel->IsModeSet('r')))
@@ -56,7 +56,7 @@ class User_r : public ModeHandler
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
-		if (IS_REMOTE(source) || ServerInstance->ULine(source->nick.c_str()) || ServerInstance->ULine(source->server))
+		if (!IS_LOCAL(source) || ServerInstance->ULine(source->nick.c_str()) || ServerInstance->ULine(source->server))
 		{
 			if ((adding && !dest->IsModeSet('r')) || (!adding && dest->IsModeSet('r')))
 			{
@@ -117,9 +117,9 @@ class ModuleServicesAccount : public Module
 
 		ServerInstance->Extensions.Register(&accountname);
 		Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, I_OnCheckBan,
-			I_OnSyncUser, I_OnUserQuit, I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick };
+			I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick };
 
-		ServerInstance->Modules->Attach(eventlist, this, 10);
+		ServerInstance->Modules->Attach(eventlist, this, 8);
 	}
 
 	void On005Numeric(std::string &t)