summaryrefslogtreecommitdiffstats
path: root/src/Items
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-09-30 22:53:32 +0200
committerMattes D <github@xoft.cz>2014-09-30 22:53:32 +0200
commit1d185fe2073f4dd68ae9675e9bdbaa554754b8ea (patch)
treeac0c02f236ecc5904558794dc84c882d9512b0d7 /src/Items
parentMerge pull request #1485 from mc-server/PluginMessages (diff)
parentCode improvements (diff)
downloadcuberite-1d185fe2073f4dd68ae9675e9bdbaa554754b8ea.tar
cuberite-1d185fe2073f4dd68ae9675e9bdbaa554754b8ea.tar.gz
cuberite-1d185fe2073f4dd68ae9675e9bdbaa554754b8ea.tar.bz2
cuberite-1d185fe2073f4dd68ae9675e9bdbaa554754b8ea.tar.lz
cuberite-1d185fe2073f4dd68ae9675e9bdbaa554754b8ea.tar.xz
cuberite-1d185fe2073f4dd68ae9675e9bdbaa554754b8ea.tar.zst
cuberite-1d185fe2073f4dd68ae9675e9bdbaa554754b8ea.zip
Diffstat (limited to 'src/Items')
-rw-r--r--src/Items/ItemHoe.h27
1 files changed, 25 insertions, 2 deletions
diff --git a/src/Items/ItemHoe.h b/src/Items/ItemHoe.h
index de8b9a061..ae3723323 100644
--- a/src/Items/ItemHoe.h
+++ b/src/Items/ItemHoe.h
@@ -24,12 +24,35 @@ public:
{
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);
+ BLOCKTYPE Block;
+ NIBBLETYPE BlockMeta;
+ a_World->GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, Block, BlockMeta);
+
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);
+ BLOCKTYPE NewBlock = E_BLOCK_FARMLAND;
+ if (Block == E_BLOCK_DIRT)
+ {
+ switch (BlockMeta)
+ {
+ case E_META_DIRT_COARSE:
+ {
+ // Transform to normal dirt
+ NewBlock = E_BLOCK_DIRT;
+ break;
+ }
+ case E_META_DIRT_PODZOL:
+ {
+ // You can't transform this block with a hoe in vanilla
+ return false;
+ }
+ default: break;
+ }
+ }
+
+ a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, NewBlock, 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;