fix: safe call add creatures on tile get/creation (#3090)

opentibiabr · Nov 12, 2024 · af80b3d · af80b3d
1 parent 49c1540
commit af80b3d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/map/mapcache.cpp b/src/map/mapcache.cpp
@@ -132,10 +132,6 @@ std::shared_ptr<Tile> MapCache::getOrCreateTileFromCache(const std::shared_ptr<F
 
 	auto pos = Position(x, y, z);
 
-	for (const auto &creature : oldCreatureList) {
-		tile->internalAddThing(creature);
-	}
-
 	if (cachedTile->ground != nullptr) {
 		tile->internalAddThing(createItem(cachedTile->ground, pos));
 	}
@@ -146,7 +142,11 @@ std::shared_ptr<Tile> MapCache::getOrCreateTileFromCache(const std::shared_ptr<F
 
 	tile->setFlag(static_cast<TileFlags_t>(cachedTile->flags));
 
-	tile->safeCall([tile, pos] {
+	tile->safeCall([tile, pos, movedOldCreatureList = std::move(oldCreatureList)]() {
+		for (const auto &creature : movedOldCreatureList) {
+			tile->internalAddThing(creature);
+		}
+
 		for (const auto &zone : Zone::getZones(pos)) {
 			tile->addZone(zone);
 		}