From: Xunto <hunterdelyx1@gmail.com>
Date: Fri, 22 Apr 2016 12:49:06 +0000 (+0300)
Subject: Inventory: Make ItemStack with different metadata not stackable
X-Git-Tag: 0.4.14~81
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ae7fb9b5bea291f81a82912d42fc43b7e71702bf;p=oweals%2Fminetest.git

Inventory: Make ItemStack with different metadata not stackable
---

diff --git a/src/inventory.cpp b/src/inventory.cpp
index fce8575e7..cb8faecbc 100644
--- 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
 	}