diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-09-13 01:21:43 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-09-13 01:21:43 +0200 |
| commit | 69afc4dbba9ea22ed53756d0ec2b8ff138ddf781 (patch) | |
| tree | 237871b3c615fa6e1f96b89133d3d6df4e2360dd /src/Items/ItemHoe.h | |
| parent | Merge branch 'master' into 1.8-Protocol (diff) | |
| parent | Fixed friction being applied whilst airborne (diff) | |
| download | cuberite-69afc4dbba9ea22ed53756d0ec2b8ff138ddf781.tar cuberite-69afc4dbba9ea22ed53756d0ec2b8ff138ddf781.tar.gz cuberite-69afc4dbba9ea22ed53756d0ec2b8ff138ddf781.tar.bz2 cuberite-69afc4dbba9ea22ed53756d0ec2b8ff138ddf781.tar.lz cuberite-69afc4dbba9ea22ed53756d0ec2b8ff138ddf781.tar.xz cuberite-69afc4dbba9ea22ed53756d0ec2b8ff138ddf781.tar.zst cuberite-69afc4dbba9ea22ed53756d0ec2b8ff138ddf781.zip | |
Diffstat (limited to 'src/Items/ItemHoe.h')
| -rw-r--r-- | src/Items/ItemHoe.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Items/ItemHoe.h b/src/Items/ItemHoe.h index 987357739..de8b9a061 100644 --- a/src/Items/ItemHoe.h +++ b/src/Items/ItemHoe.h @@ -18,17 +18,19 @@ 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 { - if (a_Dir == BLOCK_FACE_NONE) + if ((a_Dir == BLOCK_FACE_NONE) || (a_BlockY >= cChunkDef::Height)) { return false; } - BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ); - if (IsBlockTypeOfDirt(Block)) + BLOCKTYPE UpperBlock = a_World->GetBlock(a_BlockX, a_BlockY + 1, a_BlockZ); + + if (((Block == E_BLOCK_DIRT) || (Block == E_BLOCK_GRASS)) && (UpperBlock == E_BLOCK_AIR)) { a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_FARMLAND, 0); + a_World->BroadcastSoundEffect("dig.gravel", a_BlockX + 0.5, a_BlockY + 0.5, a_BlockZ + 0.5, 1.0f, 0.8f); a_Player->UseEquippedItem(); return true; } @@ -45,4 +47,3 @@ public: - |