Skip to content

fix: some conflict errors #3048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 1, 2024
Merged

fix: some conflict errors #3048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7d6d2f
fix: some conflict errors
dudantas Nov 1, 2024
9a7eb49
fix: remove function
dudantas Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/creatures/combat/spells.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 1 addition & 3 deletions src/creatures/players/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion src/io/functions/iologindata_save_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading