diff options
author | Adam <Adam@anope.org> | 2011-02-27 22:12:51 -0500 |
---|---|---|
committer | Adam <Adam@anope.org> | 2011-02-27 22:12:51 -0500 |
commit | fdcb7e56ae21c9bccfa65822e74b381e6d467def (patch) | |
tree | 83a70f0a185e43619e4455a2d3a8d38f68dfabf7 | |
parent | 0d1a0e8db94cdbffbf72a90800c327e6e42aa8b4 (diff) |
Don't burst SXLines when we link because its unnecessary and fixed applying SQLines
-rw-r--r-- | include/operserv.h | 4 | ||||
-rw-r--r-- | src/init.cpp | 3 | ||||
-rw-r--r-- | src/operserv.cpp | 13 |
3 files changed, 1 insertions, 19 deletions
diff --git a/include/operserv.h b/include/operserv.h index 4f1afb6ec..05891e1ef 100644 --- a/include/operserv.h +++ b/include/operserv.h @@ -97,10 +97,6 @@ class CoreExport XLineManager */ static std::pair<XLineManager *, XLine *> CheckAll(User *u); - /** Called on burst when all of our XLines should be bursted to the uplink - */ - static void Burst(); - /** Get the number of XLines in this XLineManager * @return The number of XLines */ diff --git a/src/init.cpp b/src/init.cpp index f2e354e98..3c1e08855 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -77,9 +77,6 @@ void introduce_user(const Anope::string &user) /* Load MLock from the database now that we know what modes exist */ for (registered_channel_map::iterator it = RegisteredChannelList.begin(), it_end = RegisteredChannelList.end(); it != it_end; ++it) it->second->LoadMLock(); - - /* Add our SXLines */ - XLineManager::Burst(); } /*************************************************************************/ diff --git a/src/operserv.cpp b/src/operserv.cpp index 5ab792c92..316e1661d 100644 --- a/src/operserv.cpp +++ b/src/operserv.cpp @@ -252,17 +252,6 @@ std::pair<XLineManager *, XLine *> XLineManager::CheckAll(User *u) return ret; } -void XLineManager::Burst() -{ - for (std::list<XLineManager *>::iterator it = XLineManagers.begin(), it_end = XLineManagers.end(); it != it_end; ++it) - { - XLineManager *xlm = *it; - - for (std::vector<XLine *>::const_iterator it2 = xlm->GetList().begin(), it2_end = xlm->GetList().end(); it2 != it2_end; ++it2) - xlm->Send(*it2); - } -} - /** Get the number of XLines in this XLineManager * @return The number of XLines */ @@ -763,7 +752,7 @@ bool SQLineManager::Check(Channel *c) { if (ircd->chansqline && SQLine) { - for (std::vector<XLine *>::const_iterator it = SGLine->GetList().begin(), it_end = SGLine->GetList().end(); it != it_end; ++it) + for (std::vector<XLine *>::const_iterator it = SQLine->GetList().begin(), it_end = SQLine->GetList().end(); it != it_end; ++it) { XLine *x = *it; |