X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_umodes.cpp;h=1e3ea1a49b3b2181fdb6acc09cbe56e71126baea;hb=acccaa39641500b8a691db4136e6571102a438ed;hp=47f0fc1bc44fb983901f161f2ffc124eb477f0da;hpb=fd0fa86da89ab4cefa778307088ef2552a05a170;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 47f0fc1bc..1e3ea1a49 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -25,11 +25,6 @@
 class ModuleModesOnConnect : public Module
 {
  public:
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->Attach(I_OnUserConnect, this);
-	}
-
 	void Prioritize()
 	{
 		// for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t
@@ -56,26 +51,14 @@ class ModuleModesOnConnect : public Module
 			std::string buf;
 			std::stringstream ss(ThisModes);
 
-			std::vector<std::string> tokens;
-
-			// split ThisUserModes into modes and mode params
-			while (ss >> buf)
-				tokens.push_back(buf);
-
 			std::vector<std::string> modes;
 			modes.push_back(user->nick);
-			modes.push_back(tokens[0]);
 
-			if (tokens.size() > 1)
-			{
-				// process mode params
-				for (unsigned int k = 1; k < tokens.size(); k++)
-				{
-					modes.push_back(tokens[k]);
-				}
-			}
+			// split ThisUserModes into modes and mode params
+			while (ss >> buf)
+				modes.push_back(buf);
 
-			ServerInstance->Parser->CallHandler("MODE", modes, user);
+			ServerInstance->Modes->Process(modes, user);
 		}
 
 		memcpy(ServerInstance->Config->DisabledUModes, save, 64);