X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=47e12242053344ffe81d1000b51ac91b9fb869b8;hb=4d5b806140bbc41345f841d93e1e4d69fa58a5c3;hp=7ce6c3f0a5fecad261271ec273420cfc7c96a822;hpb=efce1ce1e7b05610bf765cafa82cc7618ed4872a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/xline.cpp b/src/xline.cpp
index 7ce6c3f0a..47e122420 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -158,7 +158,13 @@ bool XLineManager::AddLine(XLine* line, User* user)
 		return false;
 
 	/*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
-	pending_lines.push_back(line);
+	XLineFactory* xlf = GetFactory(line->type);
+	if (!xlf)
+		return false;
+
+	if (xlf->AutoApplyToUserList(line))
+		pending_lines.push_back(line);
+
 	lookup_lines[line->type][line->Displayable()] = line;
 	line->OnAdd();
 
@@ -403,9 +409,9 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
 	if (*ServerInstance->Config->MoronBanner)
 		u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 	if (ServerInstance->Config->HideBans)
-		User::QuitUser(ServerInstance, u, line + "-Lined", sreason);
+		ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
 	else
-		User::QuitUser(ServerInstance, u, sreason);
+		ServerInstance->Users->QuitUser(u, sreason);
 
 
 	if (bancache)