summaryrefslogtreecommitdiffstats
path: root/source/Items/ItemBucket.h
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-24 09:30:39 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-24 09:30:39 +0200
commitcf87169737fdeeee7d4b160688bbed7194e46147 (patch)
tree7daaeb9af8e3187cde6068c3cff5ff0ee64f0067 /source/Items/ItemBucket.h
parentAdded ItemCategory::IsArmor() (diff)
downloadcuberite-cf87169737fdeeee7d4b160688bbed7194e46147.tar
cuberite-cf87169737fdeeee7d4b160688bbed7194e46147.tar.gz
cuberite-cf87169737fdeeee7d4b160688bbed7194e46147.tar.bz2
cuberite-cf87169737fdeeee7d4b160688bbed7194e46147.tar.lz
cuberite-cf87169737fdeeee7d4b160688bbed7194e46147.tar.xz
cuberite-cf87169737fdeeee7d4b160688bbed7194e46147.tar.zst
cuberite-cf87169737fdeeee7d4b160688bbed7194e46147.zip
Diffstat (limited to 'source/Items/ItemBucket.h')
-rw-r--r--source/Items/ItemBucket.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/source/Items/ItemBucket.h b/source/Items/ItemBucket.h
index 098742724..4792fa62d 100644
--- a/source/Items/ItemBucket.h
+++ b/source/Items/ItemBucket.h
@@ -81,8 +81,7 @@ public:
}
// Remove the bucket from the inventory
- cItem Item(a_Item.m_ItemType, 1);
- if (!a_Player->GetInventory().RemoveItem(Item))
+ if (!a_Player->GetInventory().RemoveOneEquippedItem())
{
LOG("Clicked with an empty bucket, but cannot remove one from the inventory? WTF?");
ASSERT(!"Inventory bucket mismatch");
@@ -90,8 +89,7 @@ public:
}
// Give new bucket, filled with fluid:
- Item.m_ItemType = NewItem;
- Item.m_ItemCount = 1;
+ cItem Item(NewItem, 1);
a_Player->GetInventory().AddItem(Item);
// Remove water / lava block
@@ -131,15 +129,13 @@ public:
if (a_Player->GetGameMode() != gmCreative)
{
// Remove fluid bucket, add empty bucket:
- cItem Item(a_Item.m_ItemType, 1);
- if (!a_Player->GetInventory().RemoveItem(Item))
+ if (!a_Player->GetInventory().RemoveOneEquippedItem())
{
LOG("Clicked with a full bucket, but cannot remove one from the inventory? WTF?");
ASSERT(!"Inventory bucket mismatch");
return false;
}
- Item.m_ItemType = E_ITEM_BUCKET;
- Item.m_ItemCount = 1;
+ cItem Item(E_ITEM_BUCKET, 1);
if (!a_Player->GetInventory().AddItem(Item))
{
return false;