diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/protocol/inspircd12.cpp | 9 | ||||
| -rw-r--r-- | modules/pseudoclients/botserv.cpp | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp index d00284640..55ab40cd8 100644 --- a/modules/protocol/inspircd12.cpp +++ b/modules/protocol/inspircd12.cpp @@ -235,8 +235,15 @@ class InspIRCd12Proto : public IRCDProto BotInfo *setter = BotInfo::Find(user->nick); for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i) - if (cs.modes.count(ModeManager::ChannelModes[i]->name)) + { + ChannelMode *cm = ModeManager::ChannelModes[i]; + + if (cs.modes.count(cm->name) || cs.modes.count(cm->mchar)) + { c->SetMode(setter, ModeManager::ChannelModes[i], user->GetUID(), false); + cs.modes.insert(cm->name); + } + } } } diff --git a/modules/pseudoclients/botserv.cpp b/modules/pseudoclients/botserv.cpp index fd7f0380e..2c506876a 100644 --- a/modules/pseudoclients/botserv.cpp +++ b/modules/pseudoclients/botserv.cpp @@ -159,7 +159,7 @@ class BotServCore : public Module void OnJoinChannel(User *user, Channel *c) anope_override { - if (c->ci && c->ci->bi) + if (user->server != Me && c->ci && c->ci->bi) { /** * We let the bot join even if it was an ignored user, as if we don't, |