diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-07-23 16:32:09 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-07-23 16:32:09 +0200 |
| commit | 396739cc0faf01a099acbe669c5a9def98d3aaae (patch) | |
| tree | 91cff4c6ac486b2158edefce878174fe95e2fb3d /src/Blocks | |
| parent | CheckBasicStyle: Added a lua shebang. (diff) | |
| download | cuberite-396739cc0faf01a099acbe669c5a9def98d3aaae.tar cuberite-396739cc0faf01a099acbe669c5a9def98d3aaae.tar.gz cuberite-396739cc0faf01a099acbe669c5a9def98d3aaae.tar.bz2 cuberite-396739cc0faf01a099acbe669c5a9def98d3aaae.tar.lz cuberite-396739cc0faf01a099acbe669c5a9def98d3aaae.tar.xz cuberite-396739cc0faf01a099acbe669c5a9def98d3aaae.tar.zst cuberite-396739cc0faf01a099acbe669c5a9def98d3aaae.zip | |
Diffstat (limited to 'src/Blocks')
| -rw-r--r-- | src/Blocks/BlockLeaves.h | 16 | ||||
| -rw-r--r-- | src/Blocks/BlockTallGrass.h | 3 | ||||
| -rw-r--r-- | src/Blocks/BlockVine.h | 7 |
3 files changed, 9 insertions, 17 deletions
diff --git a/src/Blocks/BlockLeaves.h b/src/Blocks/BlockLeaves.h index 797824506..18f336225 100644 --- a/src/Blocks/BlockLeaves.h +++ b/src/Blocks/BlockLeaves.h @@ -55,22 +55,6 @@ public: } } } - - - void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override - { - cBlockHandler::OnDestroyed(a_ChunkInterface, a_WorldInterface, a_BlockX, a_BlockY, a_BlockZ); - - // 0.5% chance of dropping an apple, if the leaves' type is Apple Leaves: - NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); - cFastRandom rand; - if (((Meta & 3) == E_META_LEAVES_APPLE) && (rand.NextInt(201) == 100)) - { - cItems Drops; - Drops.push_back(cItem(E_ITEM_RED_APPLE, 1, 0)); - a_WorldInterface.SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ); - } - } virtual void OnNeighborChanged(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override diff --git a/src/Blocks/BlockTallGrass.h b/src/Blocks/BlockTallGrass.h index ba1f2e0f6..9c008f793 100644 --- a/src/Blocks/BlockTallGrass.h +++ b/src/Blocks/BlockTallGrass.h @@ -43,8 +43,9 @@ public: cItems Pickups; Pickups.Add(E_BLOCK_TALL_GRASS, 1, Meta); a_WorldInterface.SpawnItemPickups(Pickups, a_BlockX, a_BlockY, a_BlockZ); + + a_Player->UseEquippedItem(); } - a_Player->UseEquippedItem(); } diff --git a/src/Blocks/BlockVine.h b/src/Blocks/BlockVine.h index 61092af3e..1e1f6d8d2 100644 --- a/src/Blocks/BlockVine.h +++ b/src/Blocks/BlockVine.h @@ -44,6 +44,13 @@ public: } + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override + { + // Reset meta to 0 + a_Pickups.push_back(cItem(E_BLOCK_VINES, 1, 0)); + } + + static NIBBLETYPE DirectionToMetaData(char a_BlockFace) { switch (a_BlockFace) |