diff options
| author | Peter Powell <petpow@saberuk.com> | 2013-05-18 18:55:01 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2013-05-18 19:11:07 +0100 |
| commit | 5c9427cde0a949a17a476311db0a2a275345337b (patch) | |
| tree | bf4cea76e7270f476d3f19ec82db9885db9574c1 /src/commands | |
| parent | 6153822a2de1867b7b90b95e8ed9bc1a8c792c84 (diff) | |
Remove the size argument from IsChannel and IsNick.
There was only one case (which was probably an error) where these
methods were not set to their ServerLimits value.
Diffstat (limited to 'src/commands')
| -rw-r--r-- | src/commands/cmd_join.cpp | 4 | ||||
| -rw-r--r-- | src/commands/cmd_nick.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/commands/cmd_join.cpp b/src/commands/cmd_join.cpp index da2ec1b45..a88509bc2 100644 --- a/src/commands/cmd_join.cpp +++ b/src/commands/cmd_join.cpp @@ -55,7 +55,7 @@ CmdResult CommandJoin::HandleLocal(const std::vector<std::string>& parameters, L if (ServerInstance->Parser->LoopCall(user, this, parameters, 0, 1, false)) return CMD_SUCCESS; - if (ServerInstance->IsChannel(parameters[0], ServerInstance->Config->Limits.ChanMax)) + if (ServerInstance->IsChannel(parameters[0])) { Channel::JoinUser(user, parameters[0], false, parameters[1]); return CMD_SUCCESS; @@ -66,7 +66,7 @@ CmdResult CommandJoin::HandleLocal(const std::vector<std::string>& parameters, L if (ServerInstance->Parser->LoopCall(user, this, parameters, 0, -1, false)) return CMD_SUCCESS; - if (ServerInstance->IsChannel(parameters[0], ServerInstance->Config->Limits.ChanMax)) + if (ServerInstance->IsChannel(parameters[0])) { Channel::JoinUser(user, parameters[0]); return CMD_SUCCESS; diff --git a/src/commands/cmd_nick.cpp b/src/commands/cmd_nick.cpp index 4c26d947f..e58aab986 100644 --- a/src/commands/cmd_nick.cpp +++ b/src/commands/cmd_nick.cpp @@ -66,7 +66,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User { newnick = user->uuid; } - else if (!ServerInstance->IsNick(newnick, ServerInstance->Config->Limits.NickMax)) + else if (!ServerInstance->IsNick(newnick)) { user->WriteNumeric(432, "%s %s :Erroneous Nickname", user->nick.c_str(),newnick.c_str()); return CMD_FAILURE; |