diff options
| author | DukePyrolator <DukePyrolator@anope.org> | 2010-12-24 06:42:55 +0100 |
|---|---|---|
| committer | DukePyrolator <DukePyrolator@anope.org> | 2010-12-24 06:42:55 +0100 |
| commit | 4235df2b28a26cb166a250d016f1fd9b417cb94b (patch) | |
| tree | 71e7d99d4cf1c3f679593ff982baa37689f7b3e7 /modules/extra | |
| parent | a0ad3c4fef7e35c68dee128950ef95c0c56849fe (diff) | |
| parent | 1a3ba00c246803ee06a680060454fb6782e5dd7d (diff) | |
Merge branch '1.9' of ssh://anope.git.sourceforge.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'modules/extra')
| -rw-r--r-- | modules/extra/m_alias.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/extra/m_alias.cpp b/modules/extra/m_alias.cpp index 53f04e3b4..f1b6c3959 100644 --- a/modules/extra/m_alias.cpp +++ b/modules/extra/m_alias.cpp @@ -44,7 +44,7 @@ class ModuleAlias : public Module Anope::string target_client = config.ReadValue("alias", "target_client", "", i); Anope::string target_command = config.ReadValue("alias", "target_command", "", i); - if ((!fantasy &&source_client.empty()) || source_command.empty() || target_client.empty() || target_command.empty()) + if ((!fantasy && source_client.empty()) || source_command.empty() || target_client.empty() || target_command.empty()) continue; CommandAlias alias; @@ -62,12 +62,12 @@ class ModuleAlias : public Module EventReturn OnPreCommandRun(User *&u, BotInfo *&bi, Anope::string &command, Anope::string &message, ChannelInfo *&ci) { bool fantasy = ci != NULL; - std::map<Anope::string, CommandAlias, std::less<ci::string> >::const_iterator it = aliases.find(command), + std::map<Anope::string, CommandAlias, std::less<ci::string> >::const_iterator it = aliases.find(command), it_end = it; + if (it_end != aliases.end()) it_end = aliases.upper_bound(command); for (; it != it_end; ++it) { const CommandAlias &alias = it->second; - if (!fantasy && !bi->nick.equals_ci(alias.source_client)) continue; |