diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2013-05-18 12:03:55 -0700 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2013-05-18 12:03:55 -0700 |
| commit | 8f27fefa75e2952e7ab8757eb9fe4af4586817f0 (patch) | |
| tree | 752def83ea80788d6a04fb8cc8358146915e7c4a /src/commands | |
| parent | 143b2b081821f027eaa72be522ea691447980850 (diff) | |
| parent | 5c9427cde0a949a17a476311db0a2a275345337b (diff) | |
Merge pull request #543 from SaberUK/master+sizeparam-removal
Remove the size argument from IsChannel and IsNick.
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; |