diff options
| author | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2010-04-30 00:08:33 +0000 |
|---|---|---|
| committer | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2010-04-30 00:08:33 +0000 |
| commit | ab7e4301705b35fd947df688447d33fa399d66be (patch) | |
| tree | 164f45377308e6a0a961e241ad306c05c9510af9 | |
| parent | 8aa7fbe0eacc7c0aec682029ef479ca55832a534 (diff) | |
Don't use botserv bots to hold channels open, becomes too much of a problem if people unassign/reassign bots etc
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2921 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | src/chanserv.c | 5 | ||||
| -rw-r--r-- | src/regchannel.cpp | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/chanserv.c b/src/chanserv.c index 622f823d7..a99066b86 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -1206,10 +1206,7 @@ void ChanServTimer::Tick(time_t) if (!c->users.empty()) return; - if (c->ci->bi) - ircdproto->SendPart(c->ci->bi, c, NULL); - else - ircdproto->SendPart(findbot(Config.s_ChanServ), c, NULL); + ircdproto->SendPart(findbot(Config.s_ChanServ), c, NULL); /* Now delete the channel as it is empty */ if (!c->HasFlag(CH_PERSIST) && !c->ci->HasFlag(CI_PERSIST)) diff --git a/src/regchannel.cpp b/src/regchannel.cpp index 97251b977..aa2f9d3eb 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -647,13 +647,10 @@ akick->nc->display : akick->mask); c->SetMode(NULL, CMODE_INVITE); } - /* This channel has no bot assigned to it, join ChanServ */ - if (!this->bi) - { - ircdproto->SendJoin(findbot(Config.s_ChanServ), this->name.c_str(), this->c->creation_time); - } + /* Join ChanServ */ + ircdproto->SendJoin(findbot(Config.s_ChanServ), this->name.c_str(), this->c->creation_time); - /* Set a timer for this channel to part the bots later */ + /* Set a timer for this channel to part ChanServ later */ new ChanServTimer(this->c); } |