fix: review

opentibiabr · Nov 5, 2024 · edb5324 · edb5324
1 parent 7c5e838
commit edb5324
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/map/spectators.cpp b/src/map/spectators.cpp
@@ -58,15 +58,15 @@ bool Spectators::checkCache(const SpectatorsCache::FloorData &specData, bool onl
 		spectators.reserve(creatures.size());
 		for (const auto &creature : *list) {
 			const auto &specPos = creature->getPosition();
-			if (centerPos.x - specPos.x >= minRangeX
-			        && centerPos.y - specPos.y >= minRangeY
-			        && centerPos.x - specPos.x <= maxRangeX
-			        && centerPos.y - specPos.y <= maxRangeY
-			        && (multifloor || specPos.z == centerPos.z)
-			        && ((onlyPlayers && creature->getPlayer())
-			            || (onlyMonsters && creature->getMonster())
-			            || (onlyNpcs && creature->getNpc()))
-			    || (!onlyPlayers && !onlyMonsters && !onlyNpcs)) {
+			if ((centerPos.x - specPos.x >= minRangeX
+			         && centerPos.y - specPos.y >= minRangeY
+			         && centerPos.x - specPos.x <= maxRangeX
+			         && centerPos.y - specPos.y <= maxRangeY
+			         && (multifloor || specPos.z == centerPos.z)
+			         && ((onlyPlayers && creature->getPlayer())
+			             || (onlyMonsters && creature->getMonster())
+			             || (onlyNpcs && creature->getNpc()))
+			     || (!onlyPlayers && !onlyMonsters && !onlyNpcs))) {
 				spectators.emplace_back(creature);
 			}
 		}
@@ -266,6 +266,8 @@ Spectators Spectators::excludeMaster() const {
 			specs.insert(c);
 		}
 	}
+
+	return specs;
 }
 
 Spectators Spectators::excludePlayerMaster() const {
@@ -277,10 +279,12 @@ Spectators Spectators::excludePlayerMaster() const {
 	specs.creatures.reserve(creatures.size());
 
 	for (const auto &c : creatures) {
-		if (c->getMonster() != nullptr && !c->getMaster() || !c->getMaster()->getPlayer()) {
+		if ((c->getMonster() != nullptr && !c->getMaster() || !c->getMaster()->getPlayer())) {
 			specs.insert(c);
 		}
 	}
+
+	return specs;
 }
 
 Spectators Spectators::filter(bool onlyPlayers, bool onlyMonsters, bool onlyNpcs) const {