diff options
author | Adam <Adam@anope.org> | 2010-08-24 21:34:08 -0400 |
---|---|---|
committer | Adam <Adam@anope.org> | 2010-08-24 21:34:08 -0400 |
commit | ea9b945830166ff237799460aba6236e4132a075 (patch) | |
tree | a10b282935998dfdf0accb59a6c117e551f3b7d2 /src | |
parent | 2803190255e9401e5d096cca9a53c46dc120ca3f (diff) |
Internally ULine our server, and fixed a user count check for botserv when setting -P on channels
Diffstat (limited to 'src')
-rw-r--r-- | src/channels.cpp | 2 | ||||
-rw-r--r-- | src/servers.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index 709d9cf01..65668a6d6 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -498,7 +498,7 @@ void Channel::RemoveModeInternal(ChannelMode *cm, const Anope::string ¶m, bo if (ci) { ci->UnsetFlag(CI_PERSIST); - if (!Config->s_BotServ.empty() && ci->bi && this->FindUser(ci->bi)) + if (!Config->s_BotServ.empty() && ci->bi && this->FindUser(ci->bi) && Config->BSMinUsers && this->users.size() <= Config->BSMinUsers) this->ci->bi->Part(this); } } diff --git a/src/servers.cpp b/src/servers.cpp index 520cf5f36..75f5b9249 100644 --- a/src/servers.cpp +++ b/src/servers.cpp @@ -269,6 +269,9 @@ bool Server::IsSynced() const */ bool Server::IsULined() const { + if (this == Me) + return true; + for (std::list<Anope::string>::const_iterator it = Config->Ulines.begin(), it_end = Config->Ulines.end(); it != it_end; ++it) if (it->equals_ci(this->GetName())) return true; |