Skip to content
Permalink
Browse files
Inventory: show error on invalid list names (#11368)
  • Loading branch information
SmallJoker committed Jun 20, 2021
1 parent b10091b commit 2db6b07de1e45c56f6135363939dbb3781336514
Showing with 15 additions and 12 deletions.
  1. +1 −0 src/inventory.h
  2. +14 −12 src/script/common/c_content.cpp
@@ -298,6 +298,7 @@ class Inventory
void serialize(std::ostream &os, bool incremental = false) const;
void deSerialize(std::istream &is);

// Adds a new list or clears and resizes an existing one
InventoryList * addList(const std::string &name, u32 size);
InventoryList * getList(const std::string &name);
const InventoryList * getList(const std::string &name) const;
@@ -1350,26 +1350,28 @@ void read_inventory_list(lua_State *L, int tableindex,
{
if(tableindex < 0)
tableindex = lua_gettop(L) + 1 + tableindex;

// If nil, delete list
if(lua_isnil(L, tableindex)){
inv->deleteList(name);
return;
}
// Otherwise set list

// Get Lua-specified items to insert into the list
std::vector<ItemStack> items = read_items(L, tableindex,srv);
int listsize = (forcesize != -1) ? forcesize : items.size();
size_t listsize = (forcesize > 0) ? forcesize : items.size();

// Create or clear list
InventoryList *invlist = inv->addList(name, listsize);
int index = 0;
for(std::vector<ItemStack>::const_iterator
i = items.begin(); i != items.end(); ++i){
if(forcesize != -1 && index == forcesize)
break;
invlist->changeItem(index, *i);
index++;
if (!invlist) {
luaL_error(L, "inventory list: cannot create list named '%s'", name);
return;
}
while(forcesize != -1 && index < forcesize){
invlist->deleteItem(index);
index++;

for (size_t i = 0; i < items.size(); ++i) {
if (i == listsize)
break; // Truncate provided list of items
invlist->changeItem(i, items[i]);
}
}

0 comments on commit 2db6b07

Please sign in to comment.