fix: Serene Monk not working properlly (zimbadev#433)

This PR fix issue zimbadev#430

Author: jprzimba

src/game/game.cpp

@@ -8387,12 +8387,13 @@ void Game::checkImbuementsAndSereneStatus() {
 		}
 
 		const auto &party = mapPlayer->getParty();
-		if (party) {
-			mapPlayer->setSerene(isPlayerNoBoxed(mapPlayer));
-			continue;
-		}
+		bool hasNearbyPartyMembers = party ? hasPartyMembersNearby(mapPlayer) : false;
+		bool hasLessThanSixMonsters = isPlayerNoBoxed(mapPlayer);
+
+		bool condition1 = !party || !hasNearbyPartyMembers;
+		bool condition2 = hasLessThanSixMonsters;
 
-		mapPlayer->setSerene(true);
+		mapPlayer->setSerene(condition1 && condition2);
 	}
 }
 
@@ -11731,6 +11732,45 @@ void Game::createIllusion(const std::shared_ptr<Player> &player, const Outfit_t
 	player->addCondition(outfitCondition);
 }
 
+bool Game::hasPartyMembersNearby(const std::shared_ptr<Player> &player) {
+	if (!player) {
+		return false;
+	}
+
+	const auto &party = player->getParty();
+	if (!party) {
+		return false;
+	}
+
+	const Position &centerPos = player->getPosition();
+	for (int offsetX = -3; offsetX <= 3; ++offsetX) {
+		for (int offsetY = -3; offsetY <= 3; ++offsetY) {
+			if (offsetX == 0 && offsetY == 0) {
+				continue;
+			}
+
+			const auto &tile = g_game().map.getTile(static_cast<uint16_t>(centerPos.x + offsetX), static_cast<uint16_t>(centerPos.y + offsetY), centerPos.z);
+			if (!tile) {
+				continue;
+			}
+
+			const auto &topCreature = tile->getTopCreature();
+			if (!topCreature) {
+				continue;
+			}
+
+			const auto &nearbyPlayer = topCreature->getPlayer();
+			if (nearbyPlayer && nearbyPlayer != player) {
+				if (nearbyPlayer->getParty() == party) {
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
 bool Game::isPlayerNoBoxed(const std::shared_ptr<Player> &player) {
 	if (!player) {
 		return true;
@@ -11759,6 +11799,11 @@ bool Game::isPlayerNoBoxed(const std::shared_ptr<Player> &player) {
 				continue;
 			}
 
+			// Ignore other players (including party members)
+			if (topCreature->getPlayer()) {
+				continue;
+			}
+
 			if (++monsterCount >= 6) {
 				return false;
 			}

src/game/game.hpp

@@ -980,6 +980,7 @@ class Game {
 	std::string generateHighscoreOrGetCachedQueryForEntries(const std::string &categoryName, uint32_t page, uint8_t entriesPerPage, uint32_t vocation);
 	std::string generateHighscoreOrGetCachedQueryForOurRank(const std::string &categoryName, uint8_t entriesPerPage, uint32_t playerGUID, uint32_t vocation);
 
+	bool hasPartyMembersNearby(const std::shared_ptr<Player> &player);
 	bool isPlayerNoBoxed(const std::shared_ptr<Player> &player);
 };