From 4b17c3ac1a3e34e22e53ac5db247fb32c5a49c0e Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Tue, 4 Jun 2013 11:59:20 +0000 Subject: Fixed cItem::IsStackableWith() git-svn-id: http://mc-server.googlecode.com/svn/trunk@1547 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Item.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source/Item.cpp') diff --git a/source/Item.cpp b/source/Item.cpp index 569d04980..fce4a431b 100644 --- a/source/Item.cpp +++ b/source/Item.cpp @@ -81,8 +81,15 @@ bool cItem::IsStackableWith(const cItem & a_OtherStack) const { return false; } + if (a_OtherStack.m_ItemDamage != m_ItemDamage) + { + return false; + } + if (a_OtherStack.m_Enchantments != m_Enchantments) + { + return false; + } - // TODO: match enchantments etc. return true; } -- cgit v1.2.3