diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/database/db_mysql.cpp | 2 | ||||
| -rw-r--r-- | modules/protocol/bahamut.cpp | 4 | ||||
| -rw-r--r-- | modules/protocol/inspircd11.cpp | 2 | ||||
| -rw-r--r-- | modules/protocol/plexus.cpp | 5 | ||||
| -rw-r--r-- | modules/protocol/unreal.cpp | 6 |
5 files changed, 9 insertions, 10 deletions
diff --git a/modules/database/db_mysql.cpp b/modules/database/db_mysql.cpp index 479a8c522..e0cfbd00a 100644 --- a/modules/database/db_mysql.cpp +++ b/modules/database/db_mysql.cpp @@ -166,7 +166,7 @@ class DBMySQL : public Module /* HostServ */ I_OnSetVhost, I_OnDeleteVhost }; - ModuleManager::Attach(i, this, 40); + ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } EventReturn OnLoadDatabase() diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp index cecc480f3..438703b78 100644 --- a/modules/protocol/bahamut.cpp +++ b/modules/protocol/bahamut.cpp @@ -79,9 +79,9 @@ class BahamutIRCdProto : public IRCDProto void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf) { if (Capab.HasFlag(CAPAB_TSMODE)) - send_cmd(source->nick, "MODE %s %ld %s", dest->name.c_str(), static_cast<long>(dest->creation_time), buf.c_str()); + send_cmd(source ? source->nick : Config->ServerName, "MODE %s %ld %s", dest->name.c_str(), static_cast<long>(dest->creation_time), buf.c_str()); else - send_cmd(source->nick, "MODE %s %s", dest->name.c_str(), buf.c_str()); + send_cmd(source ? source->nick : Config->ServerName, "MODE %s %s", dest->name.c_str(), buf.c_str()); } void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp index 6b97f7487..742c2dc88 100644 --- a/modules/protocol/inspircd11.cpp +++ b/modules/protocol/inspircd11.cpp @@ -127,7 +127,7 @@ class InspIRCdProto : public IRCDProto void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf) { - send_cmd(source ? source->nick : Config->OperServ, "FMODE %s %u %s", dest->name.c_str(), static_cast<unsigned>(dest->creation_time), buf.c_str()); + send_cmd(source ? source->nick : Config->ServerName, "FMODE %s %u %s", dest->name.c_str(), static_cast<unsigned>(dest->creation_time), buf.c_str()); } void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp index b060c76a3..9947d02ab 100644 --- a/modules/protocol/plexus.cpp +++ b/modules/protocol/plexus.cpp @@ -184,10 +184,7 @@ class PlexusProto : public IRCDProto void SendModeInternal(const BotInfo *bi, const Channel *dest, const Anope::string &buf) { - if (bi) - send_cmd(bi->GetUID(), "MODE %s %s", dest->name.c_str(), buf.c_str()); - else - send_cmd(Config->Numeric, "MODE %s %s", dest->name.c_str(), buf.c_str()); + send_cmd(bi ? bi->GetUID() : Config->Numeric, "MODE %s %s", dest->name.c_str(), buf.c_str()); } void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp index 60419c481..29ad1e1cd 100644 --- a/modules/protocol/unreal.cpp +++ b/modules/protocol/unreal.cpp @@ -132,7 +132,7 @@ class UnrealIRCdProto : public IRCDProto void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf) { - send_cmd(source->nick, "G %s %s", dest->name.c_str(), buf.c_str()); + send_cmd(source ? source->nick : Config->ServerName, "G %s %s", dest->name.c_str(), buf.c_str()); } void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) @@ -341,7 +341,9 @@ class UnrealIRCdProto : public IRCDProto * so we will join and part us now */ BotInfo *bi = c->ci->WhoSends(); - if (c->FindUser(bi) == NULL) + if (bi == NULL) + ; + else if (c->FindUser(bi) == NULL) { bi->Join(c); bi->Part(c); |