Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Inventory: Make addItem for empty ItemStacks respect max stack size" (#8519)

Browse Source 
Revert commit e6a9e60
This commit is contained in:
ANAND ︻气デ═一 2019-05-12 22:37:15 +05:30 committed by Paramat
parent 06a749c386
commit 568694122c
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/inventory.cpp
View File

@ -257,17 +257,8 @@ ItemStack ItemStack::addItem(ItemStack newitem, IItemDefManager *itemdef)
// If this is an empty item, it's an easy job. // If this is an empty item, it's an easy job.
else if(empty()) else if(empty())
{ {
const u16 stackMax = newitem.getStackMax(itemdef);
*this = newitem; *this = newitem;
// If the item fits fully, delete it
if (count <= stackMax) {
newitem.clear(); newitem.clear();
} else { // Else the item does not fit fully. Return the rest.
count = stackMax;
newitem.remove(count);
}
} }
// If item name or metadata differs, bail out // If item name or metadata differs, bail out
else if (name != newitem.name else if (name != newitem.name
@ -306,14 +297,7 @@ bool ItemStack::itemFits(ItemStack newitem,
// If this is an empty item, it's an easy job. // If this is an empty item, it's an easy job.
else if(empty()) else if(empty())
{ {
const u16 stackMax = newitem.getStackMax(itemdef);
// If the item fits fully, delete it
if (newitem.count <= stackMax) {
newitem.clear(); newitem.clear();
} else { // Else the item does not fit fully. Return the rest.
newitem.remove(stackMax);
}
} }
// If item name or metadata differs, bail out // If item name or metadata differs, bail out
else if (name != newitem.name else if (name != newitem.name
@ -335,6 +319,7 @@ bool ItemStack::itemFits(ItemStack newitem,
if(restitem) if(restitem)
*restitem = newitem; *restitem = newitem;
return newitem.empty(); return newitem.empty();
} }