fix: transfer items house on server startup

opentibiabr · Feb 24, 2024 · 49ac33f · 49ac33f
1 parent c926ea5
commit 49ac33f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/game/scheduling/save_manager.cpp b/src/game/scheduling/save_manager.cpp
@@ -59,7 +59,9 @@ void SaveManager::schedulePlayer(std::weak_ptr<Player> playerPtr) {
 
 	// Disable save async if the config is set to false
 	if (!g_configManager().getBoolean(TOGGLE_SAVE_ASYNC, __FUNCTION__)) {
-		logger.debug("Saving player {}.", playerToSave->getName());
+		if (g_game().getGameState() == GAME_STATE_NORMAL) {
+			logger.debug("Saving player {}.", playerToSave->getName());
+		}
 		doSavePlayer(playerToSave);
 		return;
 	}
@@ -90,7 +92,9 @@ bool SaveManager::doSavePlayer(std::shared_ptr<Player> player) {
 	Benchmark bm_savePlayer;
 	Player::PlayerLock lock(player);
 	m_playerMap.erase(player->getGUID());
-	logger.debug("Saving player {}...", player->getName());
+	if (g_game().getGameState() == GAME_STATE_NORMAL) {
+		logger.debug("Saving player {}.", player->getName());
+	}
 
 	bool saveSuccess = IOLoginData::savePlayer(player);
 	if (!saveSuccess) {

diff --git a/src/io/iomapserialize.cpp b/src/io/iomapserialize.cpp
@@ -47,8 +47,9 @@ void IOMapSerialize::loadHouseItems(Map* map) {
 
 		while (item_count--) {
 			if (auto houseTile = std::dynamic_pointer_cast<HouseTile>(tile)) {
-				const auto house = houseTile->getHouse();
-				if (house->getOwner() == 0) {
+				const auto &house = houseTile->getHouse();
+				auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART, __FUNCTION__);
+				if (!isTransferOnRestart && house->getOwner() == 0) {
 					g_logger().trace("Skipping load item from house id: {}, position: {}, house does not have owner", house->getId(), house->getEntryPosition().toString());
 					house->clearHouseInfo(false);
 					continue;

diff --git a/src/items/item.cpp b/src/items/item.cpp
@@ -831,7 +831,7 @@ Attr_ReadValue Item::readAttr(AttrTypes_t attr, PropStream &propStream) {
 				return ATTR_READ_ERROR;
 			}
 
-			g_logger().debug("Setting flag {} flags, to item id {}", flags, getID());
+			g_logger().trace("Setting obtain flag {} flags, to item id {}", flags, getID());
 			setAttribute(ItemAttribute_t::OBTAINCONTAINER, flags);
 			break;
 		}