X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=4da62359087ad0a3e43c926a2a16b84493cd0484;hb=7107ec12d8640d35cfe3d5002db1bc1deb33625d;hp=b150f2828ebb4951b809ee0189a84bb572831ba7;hpb=e2af2347fc035d702e45f12e772223a8d578410d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index b150f2828..4da623590 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -20,17 +20,17 @@
 
 void FloodQuitUserHandler::Call(User* current)
 {
-	Server->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident.c_str(), current->host.c_str());
-	Server->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s",
+	ServerInstance->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident.c_str(), current->host.c_str());
+	ServerInstance->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s",
 			current->registered == REG_ALL ? current->nick.c_str() : "",
 			current->registered == REG_ALL ? "!" : "", current->ident.c_str(), current->host.c_str());
-	Server->Users->QuitUser(current, "Excess flood");
+	ServerInstance->Users->QuitUser(current, "Excess flood");
 
 	if (current->registered != REG_ALL)
 	{
-		ZLine* zl = new ZLine(Server, Server->Time(), 0, Server->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
-		if (Server->XLines->AddLine(zl,NULL))
-			Server->XLines->ApplyLines();
+		ZLine* zl = new ZLine(ServerInstance->Time(), 0, ServerInstance->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
+		if (ServerInstance->XLines->AddLine(zl,NULL))
+			ServerInstance->XLines->ApplyLines();
 		else
 			delete zl;
 	}
@@ -61,11 +61,6 @@ void InspIRCd::DoBackgroundUserStuff()
 			curr->OnDataReady();
 		}
 
-		if (curr->getSendQSize() == 0)
-		{
-			FOREACH_MOD(I_OnBufferFlushed,OnBufferFlushed(curr));
-		}
-
 		switch (curr->registered)
 		{
 			case REG_ALL: