diff options
author | Mattes D <github@xoft.cz> | 2014-12-14 17:39:50 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-12-14 17:39:50 +0100 |
commit | 81446b0f809c1a15b45f0f3118f0a68eb0565f91 (patch) | |
tree | 0c0038b9a2421f829d1fa08af90ccb293cd0b0ec /src/Items/ItemDye.h | |
parent | Merge pull request #1670 from Masy98/crafting (diff) | |
parent | Merge branch 'master' into Cocoa (diff) | |
download | cuberite-81446b0f809c1a15b45f0f3118f0a68eb0565f91.tar cuberite-81446b0f809c1a15b45f0f3118f0a68eb0565f91.tar.gz cuberite-81446b0f809c1a15b45f0f3118f0a68eb0565f91.tar.bz2 cuberite-81446b0f809c1a15b45f0f3118f0a68eb0565f91.tar.lz cuberite-81446b0f809c1a15b45f0f3118f0a68eb0565f91.tar.xz cuberite-81446b0f809c1a15b45f0f3118f0a68eb0565f91.tar.zst cuberite-81446b0f809c1a15b45f0f3118f0a68eb0565f91.zip |
Diffstat (limited to 'src/Items/ItemDye.h')
-rw-r--r-- | src/Items/ItemDye.h | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/src/Items/ItemDye.h b/src/Items/ItemDye.h index ccf4714f7..da978040d 100644 --- a/src/Items/ItemDye.h +++ b/src/Items/ItemDye.h @@ -4,6 +4,7 @@ #include "ItemHandler.h" #include "../World.h" #include "../Entities/Player.h" +#include "../Blocks/BlockCocoaPod.h" @@ -16,10 +17,9 @@ public: cItemDyeHandler(int a_ItemType) : cItemHandler(a_ItemType) { - } - 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_BlockFace) override { // Handle growing the plants: if (a_Item.m_ItemDamage == E_META_DYE_WHITE) @@ -34,8 +34,50 @@ public: } } } + else if ((a_Item.m_ItemDamage == E_META_DYE_BROWN) && (a_BlockFace >= BLOCK_FACE_ZM) && (a_BlockFace <= BLOCK_FACE_XP)) + { + BLOCKTYPE BlockType; + NIBBLETYPE BlockMeta; + a_World->GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, BlockType, BlockMeta); + + // Check if the block that the player clicked is a jungle log. + if ((BlockType != E_BLOCK_LOG) || ((BlockMeta & 0x3) != E_META_LOG_JUNGLE)) + { + return false; + } + + // Get the location from the new cocoa pod. + AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, false); + BlockMeta = cBlockCocoaPodHandler::BlockFaceToMeta(a_BlockFace); + + if (a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ) != E_BLOCK_AIR) + { + return false; + } + + // Check plugins + if (cRoot::Get()->GetPluginManager()->CallHookPlayerPlacingBlock(*a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, 0, 0, 0, E_BLOCK_COCOA_POD, BlockMeta)) + { + a_World->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, a_Player); + a_Player->GetInventory().SendEquippedSlot(); + return false; + } + + // Set block and broadcast place sound + a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_COCOA_POD, BlockMeta); + a_World->BroadcastSoundEffect("dig.stone", a_BlockX + 0.5, a_BlockY + 0.5, a_BlockZ + 0.5, 1.0f, 0.8f); + + // Remove one cocoa pod from the inventory + if (!a_Player->IsGameModeCreative()) + { + a_Player->GetInventory().RemoveOneEquippedItem(); + } + cRoot::Get()->GetPluginManager()->CallHookPlayerPlacedBlock(*a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, 0, 0, 0, E_BLOCK_COCOA_POD, BlockMeta); + return true; + } return false; } + } ; |