pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-04 02:42:26 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #84 from Valorith/copilot/sub-pr-80-yet-again

Browse Source 
Fix partial inventory write: rollback transaction on PutItemInInventory failure
This commit is contained in:
Vayle 2026-03-19 22:42:29 -04:00 committed by GitHub
commit 4663353699
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
zone/inventory.cpp
View File

@ -4745,15 +4745,30 @@ bool Client::PutItemInInventoryWithStacking(EQ::ItemInstance *inst)
} }
if (!queue.empty()) { if (!queue.empty()) {
bool success = true;
database.TransactionBegin(); database.TransactionBegin();
for (auto const &i: queue) { for (auto const &i: queue) {
auto bag_inst = GetInv().GetItem(i.slot_id); auto bag_inst = GetInv().GetItem(i.slot_id);
if (!bag_inst) { if (!bag_inst) {
LogError("Client inventory error occurred. Character ID {} Slot_ID {}", CharacterID(), i.slot_id); LogError("Client inventory error occurred. Character ID {} Slot_ID {}", CharacterID(), i.slot_id);
continue; success = false;
break;
} }
bag_inst->SetCharges(i.quantity + bag_inst->GetCharges()); bag_inst->SetCharges(i.quantity + bag_inst->GetCharges());
PutItemInInventory(i.slot_id, *bag_inst, true); if (!PutItemInInventory(i.slot_id, *bag_inst, true)) {
LogError(
"Failed to save stacked item to inventory. Character ID {} Slot_ID {}",
CharacterID(),
i.slot_id
);
success = false;
break;
}
}
if (!success) {
database.TransactionRollback();
return false;
} }
database.TransactionCommit(); database.TransactionCommit();