summaryrefslogtreecommitdiffstats
path: root/source/UI
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-08-02 09:11:55 +0200
committermadmaxoft <github@xoft.cz>2013-08-02 09:12:16 +0200
commitedb299db09a9701f273a49bcd7fe63f545d159b4 (patch)
tree43533ea49b28b834394388b9731e806d8364c138 /source/UI
parentMerge pull request #35 from mc-server/foodstuffs (diff)
downloadcuberite-edb299db09a9701f273a49bcd7fe63f545d159b4.tar
cuberite-edb299db09a9701f273a49bcd7fe63f545d159b4.tar.gz
cuberite-edb299db09a9701f273a49bcd7fe63f545d159b4.tar.bz2
cuberite-edb299db09a9701f273a49bcd7fe63f545d159b4.tar.lz
cuberite-edb299db09a9701f273a49bcd7fe63f545d159b4.tar.xz
cuberite-edb299db09a9701f273a49bcd7fe63f545d159b4.tar.zst
cuberite-edb299db09a9701f273a49bcd7fe63f545d159b4.zip
Diffstat (limited to 'source/UI')
-rw-r--r--source/UI/SlotArea.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/UI/SlotArea.cpp b/source/UI/SlotArea.cpp
index dddb20885..d255e0cd9 100644
--- a/source/UI/SlotArea.cpp
+++ b/source/UI/SlotArea.cpp
@@ -187,7 +187,7 @@ void cSlotArea::DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_
for (int i = 0; i < m_NumSlots; i++)
{
const cItem * Slot = GetSlot(i, a_Player);
- if (!Slot->IsSameType(a_ItemStack) && (!Slot->IsEmpty() || a_KeepEmptySlots))
+ if (!Slot->IsStackableWith(a_ItemStack) && (!Slot->IsEmpty() || a_KeepEmptySlots))
{
// Different items
continue;