fix crash on updateTargetList

opentibiabr · Oct 11, 2023 · e4320e1 · e4320e1
1 parent 73827db
commit e4320e1
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/creatures/monsters/monster.cpp b/src/creatures/monsters/monster.cpp
@@ -340,10 +340,16 @@ void Monster::updateTargetList() {
 
 	auto targetIterator = targetIDList.begin();
 	while (targetIterator != targetIDList.end()) {
-		auto creature = targetListMap[*targetIterator].lock();
+		const uint32_t targetId = *targetIterator;
+
+		auto creature = targetListMap[targetId].lock();
 		if (!creature || creature->getHealth() <= 0 || !canSee(creature->getPosition())) {
 			targetIterator = targetIDList.erase(targetIterator);
-			targetListMap.erase(*targetIterator);
+
+			auto itTLM = targetListMap.find(targetId);
+			if (itTLM != targetListMap.end()) {
+				targetListMap.erase(itTLM);
+			}
 		} else {
 			++targetIterator;
 		}