diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-06-04 13:59:20 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-06-04 13:59:20 +0200 |
| commit | 4b17c3ac1a3e34e22e53ac5db247fb32c5a49c0e (patch) | |
| tree | caafcd717a5b7830fd04d27a0b51d777361267b6 /source/Item.cpp | |
| parent | Added cItem copy-constructor to Lua API, made cItem::IsEqual() and IsStackable() enchantment-aware (diff) | |
| download | cuberite-4b17c3ac1a3e34e22e53ac5db247fb32c5a49c0e.tar cuberite-4b17c3ac1a3e34e22e53ac5db247fb32c5a49c0e.tar.gz cuberite-4b17c3ac1a3e34e22e53ac5db247fb32c5a49c0e.tar.bz2 cuberite-4b17c3ac1a3e34e22e53ac5db247fb32c5a49c0e.tar.lz cuberite-4b17c3ac1a3e34e22e53ac5db247fb32c5a49c0e.tar.xz cuberite-4b17c3ac1a3e34e22e53ac5db247fb32c5a49c0e.tar.zst cuberite-4b17c3ac1a3e34e22e53ac5db247fb32c5a49c0e.zip | |
Diffstat (limited to 'source/Item.cpp')
| -rw-r--r-- | source/Item.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
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; } |