Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-12-25 07:32:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Inventory: Fix deleted inventory being used for regaining locked lists

Browse Source
This commit is contained in:
Desour 2023-10-23 00:51:38 +02:00 committed by DS
parent a464b41d99
commit 454eb3901d
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/inventorymanager.cpp
View File

@ -244,44 +244,37 @@ int IMoveAction::allowMove(int try_take_count, ServerActiveObject *player) const
void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGameDef *gamedef) void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGameDef *gamedef)
{ {
Inventory *inv_from = mgr->getInventory(from_inv); auto get_borrow_checked_invlist = [mgr](const InventoryLocation &invloc,
Inventory *inv_to = mgr->getInventory(to_inv); const std::string &listname) -> InventoryList::ResizeLocked
if (!inv_from) {
infostream << "IMoveAction::apply(): FAIL: source inventory not found: "
<< "from_inv=\""<<from_inv.dump() << "\""
<< ", to_inv=\"" << to_inv.dump() << "\"" << std::endl;
return;
}
if (!inv_to) {
infostream << "IMoveAction::apply(): FAIL: destination inventory not found: "
<< "from_inv=\"" << from_inv.dump() << "\""
<< ", to_inv=\"" << to_inv.dump() << "\"" << std::endl;
return;
}
auto get_borrow_checked_invlist = [](Inventory *inv, const std::string &listname)
-> InventoryList::ResizeLocked
{ {
Inventory *inv = mgr->getInventory(invloc);
if (!inv)
return nullptr;
InventoryList *list = inv->getList(listname); InventoryList *list = inv->getList(listname);
if (!list) if (!list)
return nullptr; return nullptr;
return list->resizeLock(); return list->resizeLock();
}; };
auto list_from = get_borrow_checked_invlist(inv_from, from_list); auto list_from = get_borrow_checked_invlist(from_inv, from_list);
auto list_to = get_borrow_checked_invlist(inv_to, to_list); auto list_to = get_borrow_checked_invlist(to_inv, to_list);
if (!list_from) { if (!list_from) {
infostream << "IMoveAction::apply(): FAIL: source list not found: " infostream << "IMoveAction::apply(): FAIL: source inventory or list not found: "
<< "from_inv=\"" << from_inv.dump() << "\"" << "from_inv=\"" << from_inv.dump() << "\""
<< ", from_list=\"" << from_list << "\"" << std::endl; << ", from_list=\"" << from_list << "\""
<< ", to_inv=\"" << to_inv.dump() << "\""
<< ", to_list=\"" << to_list << "\""
<< std::endl;
return; return;
} }
if (!list_to) { if (!list_to) {
infostream << "IMoveAction::apply(): FAIL: destination list not found: " infostream << "IMoveAction::apply(): FAIL: destination inventory or list not found: "
<< "to_inv=\"" << to_inv.dump() << "\"" << "from_inv=\"" << from_inv.dump() << "\""
<< ", to_list=\"" << to_list << "\"" << std::endl; << ", from_list=\"" << from_list << "\""
<< ", to_inv=\"" << to_inv.dump() << "\""
<< ", to_list=\"" << to_list << "\""
<< std::endl;
return; return;
} }
@ -314,7 +307,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
assert(move_count <= count); assert(move_count <= count);
count -= move_count; count -= move_count;
list_to = get_borrow_checked_invlist(inv_to, to_list); list_to = get_borrow_checked_invlist(to_inv, to_list);
if (!list_to) { if (!list_to) {
// list_to was removed. simulate an empty list // list_to was removed. simulate an empty list
dest_size = 0; dest_size = 0;
@ -599,7 +592,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
onMove(count, player); onMove(count, player);
if (did_swap) { if (did_swap) {
// Item is now placed in source list // Item is now placed in source list
list_from = get_borrow_checked_invlist(inv_from, from_list); list_from = get_borrow_checked_invlist(from_inv, from_list);
if (list_from) { if (list_from) {
src_item = list_from->getItem(from_i); src_item = list_from->getItem(from_i);
list_from.reset(); list_from.reset();
@ -621,7 +614,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
src_item.count = src_item_count; src_item.count = src_item_count;
if (did_swap) { if (did_swap) {
// Item is now placed in source list // Item is now placed in source list
list_from = get_borrow_checked_invlist(inv_from, from_list); list_from = get_borrow_checked_invlist(from_inv, from_list);
if (list_from) { if (list_from) {
src_item = list_from->getItem(from_i); src_item = list_from->getItem(from_i);
list_from.reset(); list_from.reset();