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

Revert commit e6a9e60

diff --git a/src/inventory.cpp b/src/inventory.cpp
index 2335136b12e012a6bca9d11179db5dba23d469cd..40dc602d0e855883a1d0a42549bdedb117c1fcda 100644 (file)
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -257,17 +257,8 @@ ItemStack ItemStack::addItem(ItemStack newitem, IItemDefManager *itemdef)
        // If this is an empty item, it's an easy job.
        else if(empty())
        {
-               const u16 stackMax = newitem.getStackMax(itemdef);
-
                *this = newitem;
-
-               // If the item fits fully, delete it
-               if (count <= stackMax) {
-                       newitem.clear();
-               } else { // Else the item does not fit fully. Return the rest.
-                       count = stackMax;
-                       newitem.remove(count);
-               }
+               newitem.clear();
        }
        // If item name or metadata differs, bail out
        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.
        else if(empty())
        {
-               const u16 stackMax = newitem.getStackMax(itemdef);
-
-               // If the item fits fully, delete it
-               if (newitem.count <= stackMax) {
-                       newitem.clear();
-               } else { // Else the item does not fit fully. Return the rest.
-                       newitem.remove(stackMax);
-               }
+               newitem.clear();
        }
        // If item name or metadata differs, bail out
        else if (name != newitem.name
@@ -335,6 +319,7 @@ bool ItemStack::itemFits(ItemStack newitem,
 
        if(restitem)
                *restitem = newitem;
+
        return newitem.empty();
 }