flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

cWindow: Fixed item dupe glitch with painting (#278)

Browse Source
This commit is contained in:
madmaxoft 2013-11-12 13:15:09 +01:00
parent 8fa8107e45
commit 11c5ad1170
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/UI/Window.cpp
View File

@ -628,7 +628,7 @@ int cWindow::DistributeItemToSlots(cPlayer & a_Player, const cItem & a_Item, int
// Modify the item at the slot // Modify the item at the slot
cItem AtSlot(*Area->GetSlot(LocalSlotNum, a_Player)); cItem AtSlot(*Area->GetSlot(LocalSlotNum, a_Player));
int MaxStack = ItemHandler(AtSlot.m_ItemType)->GetMaxStackSize(); int MaxStack = AtSlot.GetMaxStackSize();
if (AtSlot.IsEmpty()) if (AtSlot.IsEmpty())
{ {
// Empty, just move all of it there: // Empty, just move all of it there:
@ -637,7 +637,7 @@ int cWindow::DistributeItemToSlots(cPlayer & a_Player, const cItem & a_Item, int
Area->SetSlot(LocalSlotNum, a_Player, ToStore); Area->SetSlot(LocalSlotNum, a_Player, ToStore);
NumDistributed += ToStore.m_ItemCount; NumDistributed += ToStore.m_ItemCount;
} }
else else if (AtSlot.IsStackableWith(a_Item))
{ {
// Occupied, add and cap at MaxStack: // Occupied, add and cap at MaxStack:
int CanStore = std::min(a_NumToEachSlot, (int)MaxStack - AtSlot.m_ItemCount); int CanStore = std::min(a_NumToEachSlot, (int)MaxStack - AtSlot.m_ItemCount);