Skip to content
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

fix: house transfer item to owner #3258

Merged
merged 2 commits into from
Jan 25, 2025
Merged

fix: house transfer item to owner #3258

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4988b1b
fix: house transfer
dudantas Jan 19, 2025
9078bdc
Merge branch 'main' into dudantas/fix-house-transfer-owner-items
majestyotbr Jan 25, 2025
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
16 changes: 10 additions & 6 deletions src/map/house/house.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,21 +315,25 @@ bool House::transferToDepot(const std::shared_ptr<Player> &player, const std::sh
std::unordered_set<std::shared_ptr<Player>> playersToSave = { player };

for (const auto &item : moveItemList) {
g_logger().debug("[{}] moving item '{}' to depot", __FUNCTION__, item->getName());
auto targetPlayer = player;
std::shared_ptr<Player> targetPlayer = player;

if (item->hasOwner() && !item->isOwner(targetPlayer)) {
targetPlayer = g_game().getPlayerByGUID(item->getOwnerId());
if (!targetPlayer) {
g_game().internalRemoveItem(item, item->getItemCount());
const auto &itemOwner = g_game().getPlayerByGUID(item->getOwnerId(), true);
if (itemOwner) {
targetPlayer = itemOwner;
playersToSave.insert(targetPlayer);
} else {
g_logger().warn("[{}] owner of item '{}' (GUID: {}) not found, skipping transfer", __FUNCTION__, item->getName(), item->getOwnerId());
continue;
}
playersToSave.insert(targetPlayer);
}

g_game().internalMoveItem(item->getParent(), targetPlayer->getInbox(), INDEX_WHEREEVER, item, item->getItemCount(), nullptr, FLAG_NOLIMIT);
}
for (const auto &playerToSave : playersToSave) {
g_saveManager().savePlayer(playerToSave);
}

return true;
}

Expand Down
Loading