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

Add unkown armor warning and fix armor stacks.

Browse Source
This commit is contained in:
Howaner 2014-04-25 00:09:22 +02:00
parent 376dc880b3
commit cee70390fa
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Items/ItemArmor.h
View File

@ -19,7 +19,7 @@ public:
virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
{ {
int SlotNum = -1; int SlotNum;
if (ItemCategory::IsHelmet(a_Item.m_ItemType)) if (ItemCategory::IsHelmet(a_Item.m_ItemType))
{ {
SlotNum = 0; SlotNum = 0;
@ -36,6 +36,11 @@ public:
{ {
SlotNum = 3; SlotNum = 3;
} }
else
{
LOGWARNING("Used unknown armor: %i", a_Item.m_ItemType);
return false;
}
if (!a_Player->GetInventory().GetArmorSlot(SlotNum).IsEmpty()) if (!a_Player->GetInventory().GetArmorSlot(SlotNum).IsEmpty())
{ {
@ -43,7 +48,14 @@ public:
} }
a_Player->GetInventory().SetArmorSlot(SlotNum, a_Item.CopyOne()); a_Player->GetInventory().SetArmorSlot(SlotNum, a_Item.CopyOne());
a_Player->GetInventory().SetHotbarSlot(a_Player->GetInventory().GetEquippedSlotNum(), cItem());
cItem Item(a_Item);
Item.m_ItemCount--;
if (Item.m_ItemCount <= 0)
{
Item.Empty();
}
a_Player->GetInventory().SetHotbarSlot(a_Player->GetInventory().GetEquippedSlotNum(), Item);
return true; return true;
} }