fix: Serene and Harmony when closing game client

src/creatures/players/player.cpp

@@ -12210,6 +12210,26 @@ void Player::setSereneCooldown(const uint64_t addTime) {
 	m_serene_cooldown = timenow + addTime;
 }
 
+void Player::resyncSpellCooldowns() const {
+	if (!client) {
+		return;
+	}
+
+	// Resync individual spell cooldowns
+	for (const auto &condition : getConditionsByType(CONDITION_SPELLCOOLDOWN)) {
+		uint16_t spellId = condition->getSubId();
+		uint32_t ticks = condition->getTicks();
+		sendSpellCooldown(spellId, ticks);
+	}
+
+	// Resync group spell cooldowns
+	for (const auto &condition : getConditionsByType(CONDITION_SPELLGROUPCOOLDOWN)) {
+		SpellGroup_t groupId = static_cast<SpellGroup_t>(condition->getSubId());
+		uint32_t ticks = condition->getTicks();
+		client->sendSpellGroupCooldown(groupId, ticks);
+	}
+}
+
 void Player::sendVirtueProtocol() const {
 	if (client && m_virtue != VIRTUE_NONE) {
 		client->sendVirtueProtocol(static_cast<uint8_t>(m_virtue));

src/creatures/players/player.hpp

@@ -1497,11 +1497,11 @@
 	 * added to the player or being updated, there is a chance to prevent these actions
 	 ******************************************************************************/
 	struct DeflectCondition {
 		DeflectCondition(std::string source, ConditionType_t condition, uint8_t chance) :
 			source(source), condition(condition), chance(chance) { }
 		std::string source;
 		uint8_t chance = 0;
 		ConditionType_t condition = CONDITION_NONE;
 	};
 
 	const std::vector<DeflectCondition> &getDeflectConditions() const {
@@ -1528,6 +1528,7 @@
 	void setSerene(const bool isSerene);
 	uint64_t getSereneCooldown();
 	void setSereneCooldown(const uint64_t addTime);
+	void resyncSpellCooldowns() const;
 	void sendVirtueProtocol() const;
 	void setVirtue(const VirtueMonk_t virtue);
 	VirtueMonk_t getVirtue() const;

src/server/network/protocol/protocolgame.cpp

@@ -776,6 +776,11 @@ void ProtocolGame::connect(const std::string &playerName, OperatingSystem_t oper
 
 	player->client = getThis();
 	player->openPlayerContainers();
+
+	player->sendHarmonyProtocol();
+	player->sendSereneProtocol();
+	player->resyncSpellCooldowns();
+
 	sendAddCreature(player, player->getPosition(), 0, true);
 	player->lastIP = player->getIP();
 	player->lastLoad = OTSYS_TIME();

src/server/network/protocol/protocolgame.hpp

@@ -541,7 +541,7 @@ class ProtocolGame final : public Protocol {
 	void parseWheelGemAction(NetworkMessage &msg);
 
 	void sendHarmonyProtocol(const uint8_t harmonyValue);
-	void sendSereneProtocol(const bool isSerene);
+	void sendSereneProtocol(const bool isSerene = true);
 	void sendVirtueProtocol(const uint8_t virtueValue);
 	void parseSelectSpellAimProtocol(NetworkMessage &msg);