Merge branch 'main' into fix-dmg-console-msg

src/creatures/combat/spells.hpp

@@ -50,7 +50,6 @@ class Spells final : public Scripts {
 	std::list<uint16_t> getSpellsByVocation(uint16_t vocationId);
 
 	[[nodiscard]] const std::map<std::string, std::shared_ptr<InstantSpell>> &getInstantSpells() const;
-	;
 
 	[[nodiscard]] bool hasInstantSpell(const std::string &word) const;
 

src/creatures/players/player.cpp

@@ -9138,8 +9138,6 @@ void Player::forgeTransferItemTier(ForgeAction_t actionType, uint16_t donorItemI
 		g_logger().error("[Log 8] Failed to remove transfer dusts from player with name {}", getName());
 		sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
 		return;
-	} else {
-		setForgeDusts(getForgeDusts() - g_configManager().getNumber(configKey));
 	}
 
 	setForgeDusts(getForgeDusts() - g_configManager().getNumber(configKey));
@@ -10073,7 +10071,7 @@ bool Player::setAccount(uint32_t accountId) {
 }
 
 uint8_t Player::getAccountType() const {
-	return account ? account->getAccountType() : static_cast<uint8_t>(AccountType::ACCOUNT_TYPE_NORMAL);
+	return account ? account->getAccountType() : AccountType::ACCOUNT_TYPE_NORMAL;
 }
 
 uint32_t Player::getAccountId() const {

src/io/functions/iologindata_save_player.cpp

@@ -127,7 +127,6 @@ bool IOLoginDataSave::saveItems(const std::shared_ptr<Player> &player, const Ite
 			// Serialize item attributes
 			propWriteStream.clear();
 			item->serializeAttr(propWriteStream);
-			item->stopDecaying();
 
 			size_t attributesSize;
 			const char* attributes = propWriteStream.getStream(attributesSize);