Remove UserManager::GarbageCollect()

[user/henk/code/inspircd.git] / src / modules / m_jumpserver.cpp

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 3441bb0735c85b250c6f5a2054ddd5ac812883af..e9c07f45fda18816a003a1017d8f3d150a7ff184 100644 (file)
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -108,12 +108,15 @@ class CommandJumpserver : public Command
                        if (redirect_all_immediately)
                        {
                                /* Redirect everyone but the oper sending the command */
-                               for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i)
+                               const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+                               for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); )
                                {
+                                       // Quitting the user removes it from the list
                                        LocalUser* t = *i;
+                                       ++i;
                                        if (!t->IsOper())
                                        {
-                                               t->WriteNumeric(10, "%s %s %d :Please use this Server/Port instead", t->nick.c_str(), parameters[0].c_str(), GetPort(t));
+                                               t->WriteNumeric(RPL_REDIR, "%s %d :Please use this Server/Port instead", parameters[0].c_str(), GetPort(t));
                                                ServerInstance->Users->QuitUser(t, reason);
                                                n_done++;
                                        }
@@ -157,8 +160,8 @@ class ModuleJumpServer : public Module
                if (js.redirect_new_users)
                {
                        int port = js.GetPort(user);
-                       user->WriteNumeric(10, "%s %s %d :Please use this Server/Port instead",
-                               user->nick.c_str(), js.redirect_to.c_str(), port);
+                       user->WriteNumeric(RPL_REDIR, "%s %d :Please use this Server/Port instead",
+                               js.redirect_to.c_str(), port);
                        ServerInstance->Users->QuitUser(user, js.reason);
                        return MOD_RES_PASSTHRU;
                }