From 96e0f18f7faf7bf590c311cd0b63725c64fb4800 Mon Sep 17 00:00:00 2001
From: Herman
Date: Sat, 12 Jun 2021 07:59:13 +0300
Subject: Code refactor and minor fix (#1879)

---
 src/command_parse.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/command_parse.cpp')

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index f4d8f377c..bb9a1215a 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -122,22 +122,22 @@ Command* CommandParser::GetHandler(const std::string &commandname)
 
 CmdResult CommandParser::CallHandler(const std::string& commandname, const CommandBase::Params& parameters, User* user, Command** cmd)
 {
-	CommandMap::iterator n = cmdlist.find(commandname);
-
-	if (n != cmdlist.end())
+	/* find the command, check it exists */
+	Command* handler = GetHandler(commandname);
+	if (handler)
 	{
-		if ((!parameters.empty()) && (parameters.back().empty()) && (!n->second->allow_empty_last_param))
+		if ((!parameters.empty()) && (parameters.back().empty()) && (!handler->allow_empty_last_param))
 			return CMD_INVALID;
 
-		if (parameters.size() >= n->second->min_params)
+		if (parameters.size() >= handler->min_params)
 		{
 			bool bOkay = false;
 
-			if (IS_LOCAL(user) && n->second->flags_needed)
+			if (IS_LOCAL(user) && handler->flags_needed)
 			{
 				/* if user is local, and flags are needed .. */
 
-				if (user->IsModeSet(n->second->flags_needed))
+				if (user->IsModeSet(handler->flags_needed))
 				{
 					/* if user has the flags, and now has the permissions, go ahead */
 					if (user->HasCommandPermission(commandname))
@@ -153,10 +153,10 @@ CmdResult CommandParser::CallHandler(const std::string& commandname, const Comma
 			if (bOkay)
 			{
 				if (cmd)
-					*cmd = n->second;
+					*cmd = handler;
 
 				ClientProtocol::TagMap tags;
-				return n->second->Handle(user, CommandBase::Params(parameters, tags));
+				return handler->Handle(user, CommandBase::Params(parameters, tags));
 			}
 		}
 	}
-- 
cgit v1.3.1-10-gc9f91