From fd2eed248518a5a6f856be14164cc20ccb33763e Mon Sep 17 00:00:00 2001 From: Eduardo Dantas Date: Fri, 1 Nov 2024 17:33:19 -0300 Subject: [PATCH] fix: some conflict errors (#3048) Fixed some issues caused by git conflicts. --- src/creatures/combat/spells.hpp | 1 - src/creatures/players/player.cpp | 4 +--- src/io/functions/iologindata_save_player.cpp | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/creatures/combat/spells.hpp b/src/creatures/combat/spells.hpp index c12c3af3686..ab34fa6dbce 100644 --- a/src/creatures/combat/spells.hpp +++ b/src/creatures/combat/spells.hpp @@ -50,7 +50,6 @@ class Spells final : public Scripts { std::list getSpellsByVocation(uint16_t vocationId); [[nodiscard]] const std::map> &getInstantSpells() const; - ; [[nodiscard]] bool hasInstantSpell(const std::string &word) const; diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp index 65ace44f5f6..dfdf467aa97 100644 --- a/src/creatures/players/player.cpp +++ b/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(AccountType::ACCOUNT_TYPE_NORMAL); + return account ? account->getAccountType() : AccountType::ACCOUNT_TYPE_NORMAL; } uint32_t Player::getAccountId() const { diff --git a/src/io/functions/iologindata_save_player.cpp b/src/io/functions/iologindata_save_player.cpp index c6b92514969..b38e6e2b84c 100644 --- a/src/io/functions/iologindata_save_player.cpp +++ b/src/io/functions/iologindata_save_player.cpp @@ -127,7 +127,6 @@ bool IOLoginDataSave::saveItems(const std::shared_ptr &player, const Ite // Serialize item attributes propWriteStream.clear(); item->serializeAttr(propWriteStream); - item->stopDecaying(); size_t attributesSize; const char* attributes = propWriteStream.getStream(attributesSize);