From c68aa68c699a618d0172bceacf553ab96fc32cdd Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Thu, 18 Oct 2012 19:41:29 +0000 Subject: Fixed a few bugs in fluid placement - fluid into other fluid, fluid into washable blocks. git-svn-id: http://mc-server.googlecode.com/svn/trunk@977 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Items/ItemDye.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source/Items/ItemDye.h') diff --git a/source/Items/ItemDye.h b/source/Items/ItemDye.h index 16e850719..28512c74d 100644 --- a/source/Items/ItemDye.h +++ b/source/Items/ItemDye.h @@ -13,23 +13,23 @@ class cItemDyeHandler : public cItemHandler { public: - cItemDyeHandler(int a_ItemID) - : cItemHandler(a_ItemID) + cItemDyeHandler(int a_ItemType) + : cItemHandler(a_ItemType) { } - virtual bool OnItemUse(cWorld *a_World, cPlayer *a_Player, cItem *a_Item, int a_X, int a_Y, int a_Z, char a_Dir) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, cItem * a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override { // TODO: Handle coloring the sheep, too (OnItemUseOnEntity maybe) // Handle growing the plants: if (a_Item->m_ItemHealth == E_META_DYE_WHITE) { - if (a_World->GrowRipePlant(a_X, a_Y, a_Z, true)) + if (a_World->GrowRipePlant(a_BlockX, a_BlockY, a_BlockZ, true)) { - if (a_Player->GetGameMode() == eGameMode_Survival) + if (a_Player->GetGameMode() != eGameMode_Creative) { - cItem Item(a_Item->m_ItemID, 1, a_Item->m_ItemHealth); + cItem Item(a_Item->m_ItemType, 1, a_Item->m_ItemHealth); a_Player->GetInventory().RemoveItem(Item); return true; } -- cgit v1.2.3