Fix sonar checks

opentibiabr · May 23, 2022 · 131b036 · 131b036
1 parent 2119c70
commit 131b036
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 88 deletions.
diff --git a/src/creatures/monsters/monsters.cpp b/src/creatures/monsters/monsters.cpp
@@ -1453,13 +1453,11 @@ MonsterType* Monsters::getMonsterType(const std::string& name)
 {
 	std::string lowerCaseName = asLowerCaseString(name);
 	if (auto it = monsters.find(lowerCaseName);
-	it != monsters.end())
+	it != monsters.end()
+	// We will only return the MonsterType if it match the exact name of the monster
+	&& it->first.find(lowerCaseName) != it->first.npos)
 	{
-		// We will only return the MonsterType if it match the exact name of the monster
-		if ((it->first.find(lowerCaseName)) != it->first.npos)
-		{
-			return it->second;
-		}
+		return it->second;
 	}
 	SPDLOG_ERROR("[Monsters::getMonsterType] - Monster with name {} not exist", lowerCaseName);
 	return nullptr;

diff --git a/src/creatures/monsters/monsters.h b/src/creatures/monsters/monsters.h
@@ -154,7 +154,7 @@ class MonsterType
 
 	public:
 		MonsterType() = default;
-		explicit MonsterType(const std::string initName) : name(initName), typeName(initName), nameDescription(initName) {};
+		explicit MonsterType(const std::string &initName) : name(initName), typeName(initName), nameDescription(initName) {};
 
 		// non-copyable
 		MonsterType(const MonsterType&) = delete;

diff --git a/src/creatures/npcs/npcs.h b/src/creatures/npcs/npcs.h
@@ -81,7 +81,7 @@ class NpcType
 
 	public:
 		NpcType() = default;
-		explicit NpcType(const std::string initName) : name(initName), typeName(initName), nameDescription(initName) {};
+		explicit NpcType(const std::string &initName) : name(initName), typeName(initName), nameDescription(initName) {};
 
 		// non-copyable
 		NpcType(const NpcType&) = delete;

diff --git a/src/protobuf/appearances.pb.cc b/src/protobuf/appearances.pb.cc
diff --git a/src/protobuf/appearances.pb.h b/src/protobuf/appearances.pb.h