close

src/creatures/players/player.cpp

@@ -5158,6 +5158,7 @@ void Player::addUnjustifiedDead(std::shared_ptr<Player> attacked) {
 	sendTextMessage(MESSAGE_EVENT_ADVANCE, "Warning! The murder of " + attacked->getName() + " was not justified.");
 
 	unjustifiedKills.emplace_back(attacked->getGUID(), time(nullptr), true);
+	setSaveUnjustifiedKills(true);
 
 	uint8_t dayKills = 0;
 	uint8_t weekKills = 0;
@@ -5248,11 +5249,13 @@ double Player::getLostPercent() const {
 void Player::learnInstantSpell(const std::string &spellName) {
 	if (!hasLearnedInstantSpell(spellName)) {
 		learnedInstantSpellList.push_front(spellName);
+		setSaveSpells(true);
 	}
 }
 
 void Player::forgetInstantSpell(const std::string &spellName) {
 	learnedInstantSpellList.remove(spellName);
+	setSaveSpells(true);
 }
 
 bool Player::hasLearnedInstantSpell(const std::string &spellName) const {

src/creatures/players/player.hpp

@@ -689,6 +689,7 @@ class Player final : public Creature, public Cylinder, public Bankable {
 		auto it = stashItems.find(itemId);
 		if (it != stashItems.end()) {
 			stashItems[itemId] += amount;
+			setSaveStash(true);
 			return;
 		}
 
@@ -711,6 +712,7 @@ class Player final : public Creature, public Cylinder, public Bankable {
 			} else {
 				return false;
 			}
+			setSaveStash(true);
 			return true;
 		}
 		return false;
@@ -2597,6 +2599,25 @@ class Player final : public Creature, public Cylinder, public Bankable {
 
 	bool canSpeakWithHireling(uint8_t speechbubble);
 
+	bool hasSaveStash() {
+		return saveStash;
+	}
+	void setSaveStash(bool onOff) {
+		saveStash = onOff;
+	}
+	bool hasSaveUnjustifiedKills() {
+		return saveUnjustifiedKills;
+	}
+	void setSaveUnjustifiedKills(bool onOff) {
+		saveUnjustifiedKills = onOff;
+	}
+	bool hasSaveSpells() {
+		return saveSpells;
+	}
+	void setSaveSpells(bool onOff) {
+		saveSpells = onOff;
+	}
+
 private:
 	friend class PlayerLock;
 	std::mutex mutex;
@@ -2819,6 +2840,8 @@ class Player final : public Creature, public Cylinder, public Bankable {
 	uint16_t storeXpBoost = 0;
 	uint16_t staminaXpBoost = 100;
 	int16_t lastDepotId = -1;
+
+	// Stash
 	StashItemList stashItems; // [ItemID] = amount
 	uint32_t movedItems = 0;
 
@@ -2889,6 +2912,11 @@ class Player final : public Creature, public Cylinder, public Bankable {
 	bool dead = false;
 	bool imbuementTrackerWindowOpen = false;
 
+	// Otimize Save Players
+	bool saveStash = false;
+	bool saveUnjustifiedKills = false;
+	bool saveSpells = false;
+
 	// Hazard system
 	int64_t lastHazardSystemCriticalHit = 0;
 	bool reloadHazardSystemPointsCounter = true;

src/game/game.hpp

@@ -944,6 +944,11 @@ class Game {
 	std::string generateHighscoreQueryForOurRank(const std::string &categoryName, uint8_t entriesPerPage, uint32_t playerGUID, uint32_t vocation);
 	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);
+
+	uint32_t totalImproveSave = 0;
+	uint32_t totalImproveSaveStash = 0;
+	uint32_t totalImproveSaveSpells = 0;
+	uint32_t totalImproveSaveKills = 0;
 };
 
 constexpr auto g_game = Game::getInstance;

src/io/functions/iologindata_load_player.cpp

@@ -330,6 +330,8 @@ void IOLoginDataLoad::loadPlayerKills(std::shared_ptr<Player> player, DBResult_p
 			time_t killTime = result->getNumber<time_t>("time");
 			if ((time(nullptr) - killTime) <= g_configManager().getNumber(FRAG_TIME, __FUNCTION__)) {
 				player->unjustifiedKills.emplace_back(result->getNumber<uint32_t>("target"), killTime, result->getNumber<bool>("unavenged"));
+			} else {
+				player->setSaveUnjustifiedKills(true);
 			}
 		} while (result->next());
 	}
@@ -399,6 +401,7 @@ void IOLoginDataLoad::loadPlayerStashItems(std::shared_ptr<Player> player, DBRes
 			player->addItemOnStash(result->getNumber<uint16_t>("item_id"), result->getNumber<uint32_t>("item_count"));
 		} while (result->next());
 	}
+	player->setSaveStash(false);
 }
 
 void IOLoginDataLoad::loadPlayerBestiaryCharms(std::shared_ptr<Player> player, DBResult_ptr result) {

src/io/functions/iologindata_save_player.cpp

@@ -340,6 +340,8 @@ bool IOLoginDataSave::savePlayerStash(std::shared_ptr<Player> player) {
 	if (!stashQuery.execute()) {
 		return false;
 	}
+
+	player->setSaveStash(false);
 	return true;
 }
 
@@ -369,6 +371,8 @@ bool IOLoginDataSave::savePlayerSpells(std::shared_ptr<Player> player) {
 	if (!spellsQuery.execute()) {
 		return false;
 	}
+
+	player->setSaveSpells(false);
 	return true;
 }
 
@@ -398,6 +402,8 @@ bool IOLoginDataSave::savePlayerKills(std::shared_ptr<Player> player) {
 	if (!killsQuery.execute()) {
 		return false;
 	}
+
+	player->setSaveUnjustifiedKills(false);
 	return true;
 }
 

src/io/iologindata.cpp

@@ -215,21 +215,32 @@
 		throw DatabaseException("Player nullptr in function: " + std::string(__FUNCTION__));
 	}
 
-	if (!IOLoginDataSave::savePlayerFirst(player)) {
+	g_game().addImproveSave(1)
+
+		if (!IOLoginDataSave::savePlayerFirst(player)) {
 		throw DatabaseException("[" + std::string(__FUNCTION__) + "] - Failed to save player first: " + player->getName());
 	}
 
-	if (!IOLoginDataSave::savePlayerStash(player)) {
-		throw DatabaseException("[IOLoginDataSave::savePlayerFirst] - Failed to save player stash: " + player->getName());
+	if (player->hasSaveStash()) {
+		if (!IOLoginDataSave::savePlayerStash(player)) {
+			throw DatabaseException("[IOLoginDataSave::savePlayerFirst] - Failed to save player stash: " + player->getName());
+		}
+		g_game().addImproveSave(2)
 	}
 
-	if (!IOLoginDataSave::savePlayerSpells(player)) {
-		throw DatabaseException("[IOLoginDataSave::savePlayerSpells] - Failed to save player spells: " + player->getName());
+	if (player->hasSaveSpells()) {
+		if (!IOLoginDataSave::savePlayerSpells(player)) {
+			throw DatabaseException("[IOLoginDataSave::savePlayerSpells] - Failed to save player spells: " + player->getName());
+		}
+		g_game().addImproveSave(3)
 	}
 
-	if (!IOLoginDataSave::savePlayerKills(player)) {
-		throw DatabaseException("IOLoginDataSave::savePlayerKills] - Failed to save player kills: " + player->getName());
+	if (player->hasSaveUnjustifiedKills()) {
+		if (!IOLoginDataSave::savePlayerKills(player)) {
+			throw DatabaseException("IOLoginDataSave::savePlayerKills] - Failed to save player kills: " + player->getName());
+		}
+		g_game().addImproveSave(4)
 	}
 
 	if (!IOLoginDataSave::savePlayerBestiarySystem(player)) {
 		throw DatabaseException("[IOLoginDataSave::savePlayerBestiarySystem] - Failed to save player bestiary system: " + player->getName());