diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-12-13 19:07:23 +0100 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-12-13 19:07:23 +0100 |
| commit | ec263748ac12efb9224bd9386d596336c77957b9 (patch) | |
| tree | 35d72911475bf960022160d2eec0c12d72a48cac | |
| parent | Debug? (diff) | |
| download | cuberite-ec263748ac12efb9224bd9386d596336c77957b9.tar cuberite-ec263748ac12efb9224bd9386d596336c77957b9.tar.gz cuberite-ec263748ac12efb9224bd9386d596336c77957b9.tar.bz2 cuberite-ec263748ac12efb9224bd9386d596336c77957b9.tar.lz cuberite-ec263748ac12efb9224bd9386d596336c77957b9.tar.xz cuberite-ec263748ac12efb9224bd9386d596336c77957b9.tar.zst cuberite-ec263748ac12efb9224bd9386d596336c77957b9.zip | |
| -rw-r--r-- | src/Blocks/BlockLeaves.h | 2 | ||||
| -rw-r--r-- | src/Items/ItemShears.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/Blocks/BlockLeaves.h b/src/Blocks/BlockLeaves.h index db3d682a1..68fd98170 100644 --- a/src/Blocks/BlockLeaves.h +++ b/src/Blocks/BlockLeaves.h @@ -52,7 +52,7 @@ public: cItem( E_BLOCK_SAPLING, 1, - (m_BlockType == E_BLOCK_LEAVES) ? (a_BlockMeta & 0x03) : (2 << (a_BlockMeta & 0x01)) + (a_BlockMeta & 0x3) + ((m_BlockType == E_BLOCK_LEAVES) ? 0 : 4) ) ); } diff --git a/src/Items/ItemShears.h b/src/Items/ItemShears.h index 73343f629..3dce8a9c2 100644 --- a/src/Items/ItemShears.h +++ b/src/Items/ItemShears.h @@ -39,7 +39,6 @@ public: Handler->ConvertToPickups(Drops, BlockMeta); Drops.Add(Block, 1, BlockMeta & 3); - a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ); a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0); a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ); |