diff options
author | SmallJoker <SmallJoker@users.noreply.github.com> | 2021-06-30 20:39:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-30 20:39:38 +0200 |
commit | f2fd4432625ee5cf0380bdd006cd1f15d053b12f (patch) | |
tree | c86099e50c53442900ea034342f9e50f9a87c603 /src/inventory.cpp | |
parent | 72927b73ca857acd4dc5a40a96be220d090436f3 (diff) | |
download | hax-minetest-server-f2fd4432625ee5cf0380bdd006cd1f15d053b12f.tar.gz hax-minetest-server-f2fd4432625ee5cf0380bdd006cd1f15d053b12f.zip |
Inventory: Make addList() consistent (#11382)
Fixes list clearing for inv:set_list() using same size, since 2db6b07.
addList() now clears the list in all cases. Use setSize() to resize without clearing.
Diffstat (limited to 'src/inventory.cpp')
-rw-r--r-- | src/inventory.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index fc1aaf371..b3bed623a 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -938,19 +938,16 @@ void Inventory::deSerialize(std::istream &is) InventoryList * Inventory::addList(const std::string &name, u32 size) { setModified(); + + // Remove existing lists s32 i = getListIndex(name); - if(i != -1) - { - if(m_lists[i]->getSize() != size) - { - delete m_lists[i]; - m_lists[i] = new InventoryList(name, size, m_itemdef); - m_lists[i]->setModified(); - } + if (i != -1) { + delete m_lists[i]; + m_lists[i] = new InventoryList(name, size, m_itemdef); + m_lists[i]->setModified(); return m_lists[i]; } - //don't create list with invalid name if (name.find(' ') != std::string::npos) return nullptr; |