Inventory: Make ItemStack with different metadata not stackable

diff --git a/src/inventory.cpp b/src/inventory.cpp
index fce8575e79ade5fa3d870d44981a0108028177a9..cb8faecbc4eba27fd360e848832a0b2682a93ac2 100644 (file)
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -335,8 +335,9 @@ ItemStack ItemStack::addItem(const ItemStack &newitem_,
                *this = newitem;
                newitem.clear();
        }
-       // If item name differs, bail out
-       else if(name != newitem.name)
+       // If item name or metadata differs, bail out 
+       else if (name != newitem.name
+               || metadata != newitem.metadata)
        {
                // cannot be added
        }
@@ -374,8 +375,9 @@ bool ItemStack::itemFits(const ItemStack &newitem_,
        {
                newitem.clear();
        }
-       // If item name differs, bail out
-       else if(name != newitem.name)
+       // If item name or metadata differs, bail out 
+       else if (name != newitem.name
+               || metadata != newitem.metadata)
        {
                // cannot be added
        }