summaryrefslogtreecommitdiffstats
path: root/src/Items/ItemHoe.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-09-12 20:43:05 +0200
committerMattes D <github@xoft.cz>2014-09-12 20:43:05 +0200
commitdb13405da236b5ba42d36135bf905a30341a425c (patch)
tree42e2cad05899d63f2471578b20313583ca570a70 /src/Items/ItemHoe.h
parentFixed iron ore drop. (diff)
parentOnly drop flint or gravel, not both. (diff)
downloadcuberite-db13405da236b5ba42d36135bf905a30341a425c.tar
cuberite-db13405da236b5ba42d36135bf905a30341a425c.tar.gz
cuberite-db13405da236b5ba42d36135bf905a30341a425c.tar.bz2
cuberite-db13405da236b5ba42d36135bf905a30341a425c.tar.lz
cuberite-db13405da236b5ba42d36135bf905a30341a425c.tar.xz
cuberite-db13405da236b5ba42d36135bf905a30341a425c.tar.zst
cuberite-db13405da236b5ba42d36135bf905a30341a425c.zip
Diffstat (limited to 'src/Items/ItemHoe.h')
-rw-r--r--src/Items/ItemHoe.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Items/ItemHoe.h b/src/Items/ItemHoe.h
index 8d0b71478..8e63536d4 100644
--- a/src/Items/ItemHoe.h
+++ b/src/Items/ItemHoe.h
@@ -20,11 +20,17 @@ 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
{
+ if ((a_Dir == BLOCK_FACE_NONE) || (a_BlockY >= cChunkDef::Height))
+ {
+ return false;
+ }
BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
+ BLOCKTYPE UpperBlock = a_World->GetBlock(a_BlockX, a_BlockY + 1, a_BlockZ);
- if ((Block == E_BLOCK_DIRT) || (Block == E_BLOCK_GRASS))
+ 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;
}