From 5c9427cde0a949a17a476311db0a2a275345337b Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Sat, 18 May 2013 18:55:01 +0100 Subject: 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. --- src/commands/cmd_join.cpp | 4 ++-- src/commands/cmd_nick.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/commands') 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& 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& 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& 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; -- cgit v1.2.3