diff options
| author | Adam <Adam@anope.org> | 2011-09-05 18:40:34 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-09-05 18:40:34 -0400 |
| commit | 7de1a7a6d1146cce4cdb218899cbe15b9cee32d8 (patch) | |
| tree | 53f8a7d8dddfc72e37b404411ebe002c3aee211b | |
| parent | 3815e7d61ed07ce3d06c8c8db72128ef5ceaf39c (diff) | |
Don't try and part service bots twice when channels drop
| -rw-r--r-- | modules/commands/cs_drop.cpp | 4 | ||||
| -rw-r--r-- | modules/pseudoclients/bs_main.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/modules/commands/cs_drop.cpp b/modules/commands/cs_drop.cpp index 306717c69..a42c8e58e 100644 --- a/modules/commands/cs_drop.cpp +++ b/modules/commands/cs_drop.cpp @@ -34,15 +34,13 @@ class CommandCSDrop : public Command return; } - ChannelInfo *ci = cs_findchan(params[0]); + ChannelInfo *ci = cs_findchan(chan); if (ci == NULL) { source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str()); return; } - ci = cs_findchan(chan); - if (ci->HasFlag(CI_SUSPENDED) && !u->HasCommand("chanserv/drop")) { source.Reply(CHAN_X_SUSPENDED, chan.c_str()); diff --git a/modules/pseudoclients/bs_main.cpp b/modules/pseudoclients/bs_main.cpp index c64cb5786..a286c54e7 100644 --- a/modules/pseudoclients/bs_main.cpp +++ b/modules/pseudoclients/bs_main.cpp @@ -157,7 +157,7 @@ class BotServCore : public Module if (c->HasFlag(CH_INHABIT)) return; - if (c->ci && c->ci->bi && c->users.size() - 1 <= Config->BSMinUsers && c->FindUser(c->ci->bi)) + if (c->ci && c->ci->bi && u != c->ci->bi && c->users.size() - 1 <= Config->BSMinUsers && c->FindUser(c->ci->bi)) { bool persist = c->HasFlag(CH_PERSIST); c->SetFlag(CH_PERSIST); |