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

Better combining.

Browse Source
This commit is contained in:
Howaner 2014-06-24 16:19:22 +02:00
parent 5ab01c4d42
commit 2dd7a0373b
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Entities/Pickup.cpp
View File

@ -41,12 +41,29 @@ public:
cItem & Item = ((cPickup *)a_Entity)->GetItem(); cItem & Item = ((cPickup *)a_Entity)->GetItem();
if ((Distance < 1.2) && Item.IsEqual(m_Pickup->GetItem())) if ((Distance < 1.2) && Item.IsEqual(m_Pickup->GetItem()))
{ {
if ((Item.m_ItemCount + m_Pickup->GetItem().m_ItemCount) <= Item.GetMaxStackSize()) char CombineCount = Item.m_ItemCount;
if ((CombineCount + m_Pickup->GetItem().m_ItemCount) > Item.GetMaxStackSize())
{ {
m_Pickup->GetItem().AddCount(Item.m_ItemCount); CombineCount = Item.GetMaxStackSize() - m_Pickup->GetItem().m_ItemCount;
a_Entity->Destroy();
m_FoundMatchingPickup = true;
} }
if (CombineCount <= 0)
{
return false;
}
m_Pickup->GetItem().AddCount(CombineCount);
Item.m_ItemCount -= CombineCount;
if (Item.m_ItemCount <= 0)
{
a_Entity->Destroy();
}
else
{
a_Entity->GetWorld()->BroadcastEntityMetadata(*a_Entity);
}
m_FoundMatchingPickup = true;
} }
return false; return false;
} }