The rest of the earlier command changes

1 files changed, 11 insertions, 12 deletions

diff --git a/modules/core/os_akill.cpp b/modules/core/os_akill.cpp
index e35c6264d..5053fc7a3 100644
--- a/modules/core/os_akill.cpp
+++ b/modules/core/os_akill.cpp
@@ -162,7 +162,7 @@ class CommandOSAKill : public Command
 
 		if (params.size() <= last_param)
 		{
-			this->OnSyntaxError(u, "ADD");
+			this->OnSyntaxError(source, "ADD");
 			return MOD_CONT;
 		}
 
@@ -231,7 +231,7 @@ class CommandOSAKill : public Command
 				source.Reply(READ_ONLY_MODE);
 		}
 		else
-			this->OnSyntaxError(u, "ADD");
+			this->OnSyntaxError(source, "ADD");
 
 		return MOD_CONT;
 	}
@@ -243,7 +243,7 @@ class CommandOSAKill : public Command
 
 		if (mask.empty())
 		{
-			this->OnSyntaxError(u, "DEL");
+			this->OnSyntaxError(source, "DEL");
 			return MOD_CONT;
 		}
 
@@ -371,7 +371,7 @@ class CommandOSAKill : public Command
 		User *u = source.u;
 		FOREACH_MOD(I_OnDelAkill, OnDelAkill(u, NULL));
 		SGLine->Clear();
-		u->SendMessage(OperServ, OPER_AKILL_CLEAR);
+		source.Reply(OPER_AKILL_CLEAR);
 
 		return MOD_CONT;
 	}
@@ -382,7 +382,6 @@ class CommandOSAKill : public Command
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)
 	{
-		User *u = source.u;
 		const Anope::string &cmd = params[0];
 
 		if (cmd.equals_ci("ADD"))
@@ -396,25 +395,25 @@ class CommandOSAKill : public Command
 		else if (cmd.equals_ci("CLEAR"))
 			return this->DoClear(source);
 		else
-			this->OnSyntaxError(u, "");
+			this->OnSyntaxError(source, "");
 
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
 	{
-		u->SendMessage(OperServ, OPER_HELP_AKILL);
+		source.Reply(OPER_HELP_AKILL);
 		return true;
 	}
 
-	void OnSyntaxError(User *u, const Anope::string &subcommand)
+	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
-		SyntaxError(OperServ, u, "AKILL", OPER_AKILL_SYNTAX);
+		SyntaxError(source, "AKILL", OPER_AKILL_SYNTAX);
 	}
 
-	void OnServHelp(User *u)
+	void OnServHelp(CommandSource &source)
 	{
-		u->SendMessage(OperServ, OPER_HELP_CMD_AKILL);
+		source.Reply(OPER_HELP_CMD_AKILL);
 	}
 };