Merge branch 'insp20' into master.

[user/henk/code/inspircd.git] / src / coremods / core_oper / cmd_die.cpp

diff --git a/src/coremods/core_oper/cmd_die.cpp b/src/coremods/core_oper/cmd_die.cpp
index 5fe64352058c615ef9065444f7df1082f37e41f7..b25fe24076e23d66605ed14ce6c1461b722a42aa 100644 (file)
--- a/src/coremods/core_oper/cmd_die.cpp
+++ b/src/coremods/core_oper/cmd_die.cpp
@@ -39,7 +39,8 @@ static void QuitAll()
 
 void DieRestart::SendError(const std::string& message)
 {
-       const std::string unregline = "ERROR :" + message;
+       ClientProtocol::Messages::Error errormsg(message);
+       ClientProtocol::Event errorevent(ServerInstance->GetRFCEvents().error, errormsg);
        const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
        for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
        {
@@ -51,14 +52,14 @@ void DieRestart::SendError(const std::string& message)
                else
                {
                        // Unregistered connections receive ERROR, not a NOTICE
-                       user->Write(unregline);
+                       user->Send(errorevent);
                }
        }
 }
 
 /** Handle /DIE
  */
-CmdResult CommandDie::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandDie::Handle(User* user, const Params& parameters)
 {
        if (DieRestart::CheckPass(user, parameters[0], "diepass"))
        {