improve: some reverts and others shared_ptr to const reference

src/creatures/combat/combat.cpp

@@ -867,7 +867,7 @@ void Combat::combatTileEffects(const CreatureVector &spectators, const std::shar
 			}
 		}
 
-		const auto item = Item::CreateItem(itemId);
+		const auto &item = Item::CreateItem(itemId);
 		if (caster) {
 			item->setOwner(caster);
 		}

src/creatures/combat/condition.cpp

@@ -1876,7 +1876,7 @@ bool ConditionFeared::getRandomDirection(const std::shared_ptr<Creature> &creatu
 
 	std::ranges::shuffle(directions, getRandomGenerator());
 
-	const auto &it = std::ranges::find_if(directions, [&](Direction dir) {
+	auto it = std::ranges::find_if(directions, [&](Direction dir) {
 		return canWalkTo(creature, pos, dir);
 	});
 

src/creatures/creature.cpp

@@ -1362,7 +1362,7 @@ bool Creature::setMaster(const std::shared_ptr<Creature> &newMaster, bool reload
 	m_master = newMaster;
 
 	if (oldMaster) {
-		const auto &it = std::ranges::find(oldMaster->m_summons, self);
+		auto it = std::ranges::find(oldMaster->m_summons, self);
 		if (it != oldMaster->m_summons.end()) {
 			oldMaster->m_summons.erase(it);
 		}
@@ -1640,20 +1640,17 @@ bool Creature::unregisterCreatureEvent(const std::string &name) {
 
 	bool resetTypeBit = true;
 
-	auto it = eventsList.begin();
-	const auto end = eventsList.end();
-	while (it != end) {
-		const auto &curEvent = *it;
+	std::erase_if(eventsList, [&](const auto &curEvent) {
 		if (curEvent == event) {
-			it = eventsList.erase(it);
-			continue;
+			return true;
 		}
 
 		if (curEvent->getEventType() == type) {
 			resetTypeBit = false;
 		}
-		++it;
-	}
+
+		return false;
+	});
 
 	if (resetTypeBit) {
 		scriptEventsBitField &= ~(static_cast<uint32_t>(1) << type);

src/creatures/interactions/chat.cpp

@@ -605,7 +605,7 @@ std::shared_ptr<ChatChannel> Chat::getChannel(const std::shared_ptr<Player> &pla
 		case CHANNEL_GUILD: {
 			const auto &guild = player->getGuild();
 			if (guild != nullptr) {
-				const auto &it = guildChannels.find(guild->getId());
+				auto it = guildChannels.find(guild->getId());
 				if (it != guildChannels.end()) {
 					return it->second;
 				}
@@ -616,7 +616,7 @@ std::shared_ptr<ChatChannel> Chat::getChannel(const std::shared_ptr<Player> &pla
 		case CHANNEL_PARTY: {
 			const auto &party = player->getParty();
 			if (party != nullptr) {
-				const auto &it = partyChannels.find(party);
+				auto it = partyChannels.find(party);
 				if (it != partyChannels.end()) {
 					return it->second;
 				}
@@ -625,7 +625,7 @@ std::shared_ptr<ChatChannel> Chat::getChannel(const std::shared_ptr<Player> &pla
 		}
 
 		default: {
-			const auto &it = normalChannels.find(channelId);
+			auto it = normalChannels.find(channelId);
 			if (it != normalChannels.end()) {
 				const auto &channel = it->second;
 				if (!channel->executeCanJoinEvent(player)) {
@@ -645,15 +645,15 @@ std::shared_ptr<ChatChannel> Chat::getChannel(const std::shared_ptr<Player> &pla
 }
 
 std::shared_ptr<ChatChannel> Chat::getGuildChannelById(uint32_t guildId) {
-	const auto &it = guildChannels.find(guildId);
+	auto it = guildChannels.find(guildId);
 	if (it == guildChannels.end()) {
 		return nullptr;
 	}
 	return it->second;
 }
 
 std::shared_ptr<ChatChannel> Chat::getChannelById(uint16_t channelId) {
-	const auto &it = normalChannels.find(channelId);
+	auto it = normalChannels.find(channelId);
 	if (it == normalChannels.end()) {
 		return nullptr;
 	}

src/creatures/monsters/monster.cpp

@@ -111,7 +111,7 @@ double_t Monster::getReflectPercent(CombatType_t reflectType, bool useCharges) c
 	if (result != 0) {
 		g_logger().debug("[{}] before mtype reflect element {}, percent {}", __FUNCTION__, fmt::underlying(reflectType), result);
 	}
-	const auto &it = mType->info.reflectMap.find(reflectType);
+	auto it = mType->info.reflectMap.find(reflectType);
 	if (it != mType->info.reflectMap.end()) {
 		result += it->second;
 	}
@@ -157,7 +157,7 @@ void Monster::addDefense(int32_t defense) {
 }
 
 uint32_t Monster::getHealingCombatValue(CombatType_t healingType) const {
-	const auto &it = mType->info.healingMap.find(healingType);
+	auto it = mType->info.healingMap.find(healingType);
 	if (it != mType->info.healingMap.end()) {
 		return it->second;
 	}
@@ -430,7 +430,7 @@ bool Monster::addTarget(const std::shared_ptr<Creature> &creature, bool pushFron
 
 	assert(creature != getMonster());
 
-	const auto &it = getTargetIterator(creature);
+	auto it = getTargetIterator(creature);
 	if (it != targetList.end()) {
 		return false;
 	}
@@ -453,7 +453,7 @@ bool Monster::removeTarget(const std::shared_ptr<Creature> &creature) {
 		return false;
 	}
 
-	const auto &it = getTargetIterator(creature);
+	auto it = getTargetIterator(creature);
 	if (it == targetList.end()) {
 		return false;
 	}
@@ -781,7 +781,7 @@ bool Monster::selectTarget(const std::shared_ptr<Creature> &creature) {
 		return false;
 	}
 
-	const auto &it = getTargetIterator(creature);
+	auto it = getTargetIterator(creature);
 	if (it == targetList.end()) {
 		// Target not found in our target list.
 		return false;
@@ -842,7 +842,7 @@ void Monster::onAddCondition(ConditionType_t type) {
 	onConditionStatusChange(type);
 }
 
-void Monster::onConditionStatusChange(const ConditionType_t &type) {
+void Monster::onConditionStatusChange(ConditionType_t type) {
 	if (type == CONDITION_FIRE || type == CONDITION_ENERGY || type == CONDITION_POISON) {
 		updateMapCache();
 	}

src/creatures/monsters/monster.hpp

@@ -496,5 +496,5 @@ class Monster final : public Creature {
 	void doFollowCreature(uint32_t &flags, Direction &nextDirection, bool &result);
 	void doRandomStep(Direction &nextDirection, bool &result);
 
-	void onConditionStatusChange(const ConditionType_t &type);
+	void onConditionStatusChange(ConditionType_t type);
 };

src/creatures/monsters/monsters.cpp

@@ -309,7 +309,7 @@ bool MonsterType::loadCallback(LuaScriptInterface* scriptInterface) {
 
 std::shared_ptr<MonsterType> Monsters::getMonsterType(const std::string &name, bool silent /* = false*/) const {
 	std::string lowerCaseName = asLowerCaseString(name);
-	if (const auto &it = monsters.find(lowerCaseName);
+	if (auto it = monsters.find(lowerCaseName);
 	    it != monsters.end()
 	    // We will only return the MonsterType if it match the exact name of the monster
 	    && it->first.find(lowerCaseName) != std::basic_string<char>::npos) {
@@ -328,7 +328,7 @@ std::shared_ptr<MonsterType> Monsters::getMonsterTypeByRaceId(uint16_t raceId, b
 	}
 
 	const auto &monster_race_map = g_game().getBestiaryList();
-	const auto &it = monster_race_map.find(raceId);
+	auto it = monster_race_map.find(raceId);
 	if (it == monster_race_map.end()) {
 		return nullptr;
 	}

src/creatures/npcs/npc.hpp

@@ -97,7 +97,7 @@ class Npc final : public Creature {
 
 	const std::vector<ShopBlock> &getShopItemVector(uint32_t playerGUID) const {
 		if (playerGUID != 0) {
-			const auto &it = shopPlayers.find(playerGUID);
+			auto it = shopPlayers.find(playerGUID);
 			if (it != shopPlayers.end() && !it->second.empty()) {
 				return it->second;
 			}
@@ -137,7 +137,7 @@ class Npc final : public Creature {
 	}
 
 	bool isPlayerInteractingOnTopic(uint32_t playerId, uint16_t topicId) {
-		const auto &it = playerInteractions.find(playerId);
+		auto it = playerInteractions.find(playerId);
 		if (it == playerInteractions.end()) {
 			return false;
 		}

src/creatures/npcs/npcs.cpp

@@ -131,7 +131,7 @@ bool Npcs::reload() {
 
 std::shared_ptr<NpcType> Npcs::getNpcType(const std::string &name, bool create /* = false*/) {
 	const std::string key = asLowerCaseString(name);
-	const auto &it = npcs.find(key);
+	auto it = npcs.find(key);
 
 	if (it != npcs.end()) {
 		return it->second;

src/creatures/players/achievement/player_achievement.cpp

@@ -48,7 +48,7 @@ bool PlayerAchievement::remove(uint16_t id) {
 		return false;
 	}
 
-	if (const auto &it = std::ranges::find_if(m_achievementsUnlocked, [id](auto achievement_it) {
+	if (auto it = std::ranges::find_if(m_achievementsUnlocked, [id](auto achievement_it) {
 			return achievement_it.first == id;
 		});
 	    it != m_achievementsUnlocked.end()) {
@@ -67,7 +67,7 @@ bool PlayerAchievement::isUnlocked(uint16_t id) const {
 		return false;
 	}
 
-	if (const auto &it = std::ranges::find_if(m_achievementsUnlocked, [id](auto achievement_it) {
+	if (auto it = std::ranges::find_if(m_achievementsUnlocked, [id](auto achievement_it) {
 			return achievement_it.first == id;
 		});
 	    it != m_achievementsUnlocked.end()) {

src/creatures/players/cyclopedia/player_badge.cpp

@@ -23,7 +23,7 @@ bool PlayerBadge::hasBadge(uint8_t id) const {
 		return false;
 	}
 
-	if (const auto &it = std::ranges::find_if(m_badgesUnlocked, [id](auto badge_it) {
+	if (auto it = std::ranges::find_if(m_badgesUnlocked, [id](auto badge_it) {
 			return badge_it.first.m_id == id;
 		});
 	    it != m_badgesUnlocked.end()) {

src/creatures/players/cyclopedia/player_title.cpp

@@ -22,7 +22,7 @@ bool PlayerTitle::isTitleUnlocked(uint8_t id) const {
 		return false;
 	}
 
-	if (const auto &it = std::ranges::find_if(m_titlesUnlocked, [id](auto title_it) {
+	if (auto it = std::ranges::find_if(m_titlesUnlocked, [id](auto title_it) {
 			return title_it.first.m_id == id;
 		});
 	    it != m_titlesUnlocked.end()) {
@@ -64,7 +64,7 @@ void PlayerTitle::remove(const Title &title) {
 		return;
 	}
 
-	const auto &it = std::ranges::find_if(m_titlesUnlocked, [id](auto title_it) {
+	auto it = std::ranges::find_if(m_titlesUnlocked, [id](auto title_it) {
 		return title_it.first.m_id == id;
 	});
 

src/creatures/players/grouping/familiars.cpp

@@ -72,7 +72,7 @@ bool Familiars::loadFromXml() {
 }
 
 std::shared_ptr<Familiar> Familiars::getFamiliarByLookType(uint16_t vocation, uint16_t lookType) const {
-	if (const auto &it = std::ranges::find_if(familiars[vocation], [lookType](const auto &familiar_it) {
+	if (auto it = std::ranges::find_if(familiars[vocation], [lookType](const auto &familiar_it) {
 			return familiar_it->lookType == lookType;
 		});
 	    it != familiars[vocation].end()) {

src/creatures/players/grouping/groups.cpp

@@ -98,7 +98,7 @@ bool Groups::load() {
 }
 
 std::shared_ptr<Group> Groups::getGroup(uint16_t id) const {
-	if (const auto &it = std::ranges::find_if(groups_vector, [id](auto group_it) {
+	if (auto it = std::ranges::find_if(groups_vector, [id](auto group_it) {
 			return group_it->id == id;
 		});
 	    it != groups_vector.end()) {

src/creatures/players/grouping/party.cpp

@@ -120,7 +120,7 @@ bool Party::leaveParty(const std::shared_ptr<Player> &player) {
 	}
 
 	// since we already passed the leadership, we remove the player from the list
-	const auto &it = std::ranges::find(memberList, player);
+	auto it = std::ranges::find(memberList, player);
 	if (it != memberList.end()) {
 		memberList.erase(it);
 	}
@@ -166,7 +166,7 @@ bool Party::passPartyLeadership(const std::shared_ptr<Player> &player) {
 	}
 
 	// Remove it before to broadcast the message correctly
-	const auto &it = std::ranges::find(memberList, player);
+	auto it = std::ranges::find(memberList, player);
 	if (it != memberList.end()) {
 		memberList.erase(it);
 	}
@@ -214,7 +214,7 @@ bool Party::joinParty(const std::shared_ptr<Player> &player) {
 		return false;
 	}
 
-	const auto &it = std::ranges::find(inviteList, player);
+	auto it = std::ranges::find(inviteList, player);
 	if (it == inviteList.end()) {
 		return false;
 	}
@@ -263,7 +263,7 @@ bool Party::removeInvite(const std::shared_ptr<Player> &player, bool removeFromP
 		return false;
 	}
 
-	const auto &it = std::ranges::find(inviteList, player);
+	auto it = std::ranges::find(inviteList, player);
 	if (it == inviteList.end()) {
 		return false;
 	}
@@ -530,7 +530,7 @@ uint32_t Party::getMaxLevel() {
 }
 
 bool Party::isPlayerActive(const std::shared_ptr<Player> &player) {
-	const auto &it = ticksMap.find(player->getID());
+	auto it = ticksMap.find(player->getID());
 	if (it == ticksMap.end()) {
 		return false;
 	}
@@ -565,7 +565,7 @@ void Party::updatePlayerTicks(const std::shared_ptr<Player> &player, uint32_t po
 }
 
 void Party::clearPlayerPoints(const std::shared_ptr<Player> &player) {
-	const auto &it = ticksMap.find(player->getID());
+	auto it = ticksMap.find(player->getID());
 	if (it != ticksMap.end()) {
 		ticksMap.erase(it);
 		updateSharedExperience();
@@ -747,7 +747,7 @@ void Party::addPlayerLoot(const std::shared_ptr<Player> &player, const std::shar
 	}
 
 	uint32_t count = std::max<uint32_t>(1, item->getItemCount());
-	if (const auto &it = playerAnalyzer->lootMap.find(item->getID()); it != playerAnalyzer->lootMap.end()) {
+	if (auto it = playerAnalyzer->lootMap.find(item->getID()); it != playerAnalyzer->lootMap.end()) {
 		it->second += count;
 	} else {
 		playerAnalyzer->lootMap.insert({ item->getID(), count });
@@ -774,7 +774,7 @@ void Party::addPlayerSupply(const std::shared_ptr<Player> &player, const std::sh
 		membersData.emplace_back(playerAnalyzer);
 	}
 
-	if (const auto &it = playerAnalyzer->supplyMap.find(item->getID()); it != playerAnalyzer->supplyMap.end()) {
+	if (auto it = playerAnalyzer->supplyMap.find(item->getID()); it != playerAnalyzer->supplyMap.end()) {
 		it->second += 1;
 	} else {
 		playerAnalyzer->supplyMap.insert({ item->getID(), 1 });

src/creatures/players/grouping/party.hpp

@@ -105,7 +105,7 @@ class Party final : public SharedObject {
 	void reloadPrices() const;
 
 	std::shared_ptr<PartyAnalyzer> getPlayerPartyAnalyzerStruct(uint32_t playerId) const {
-		if (const auto &it = std::ranges::find_if(membersData, [playerId](const std::shared_ptr<PartyAnalyzer> &preyIt) {
+		if (auto it = std::ranges::find_if(membersData, [playerId](const std::shared_ptr<PartyAnalyzer> &preyIt) {
 				return preyIt->id == playerId;
 			});
 		    it != membersData.end()) {

src/creatures/players/imbuements/imbuements.cpp

@@ -16,7 +16,7 @@ Imbuement* Imbuements::getImbuement(uint16_t id) {
 		return nullptr;
 	}
 
-	const auto &it = imbuementMap.find(id);
+	auto it = imbuementMap.find(id);
 	if (it == imbuementMap.end()) {
 		g_logger().warn("Imbuement {} not found", id);
 		return nullptr;

src/creatures/players/management/ban.cpp

@@ -17,7 +17,7 @@ bool Ban::acceptConnection(uint32_t clientIP) {
 
 	const uint64_t currentTime = OTSYS_TIME();
 
-	const auto &it = ipConnectMap.find(clientIP);
+	auto it = ipConnectMap.find(clientIP);
 	if (it == ipConnectMap.end()) {
 		ipConnectMap.emplace(clientIP, ConnectBlock(currentTime, 0, 1));
 		return true;