diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-03-16 14:01:22 +0100 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-03-16 21:38:57 +0100 |
| commit | b9fce71bf68768ee86ce128f353fea5533f50732 (patch) | |
| tree | ce0d3f88151971baa3adb5433aa15e072a5d02e3 /src/Items | |
| parent | Fixed InfoReg.lua's handling of multi-level commands. (diff) | |
| download | cuberite-b9fce71bf68768ee86ce128f353fea5533f50732.tar cuberite-b9fce71bf68768ee86ce128f353fea5533f50732.tar.gz cuberite-b9fce71bf68768ee86ce128f353fea5533f50732.tar.bz2 cuberite-b9fce71bf68768ee86ce128f353fea5533f50732.tar.lz cuberite-b9fce71bf68768ee86ce128f353fea5533f50732.tar.xz cuberite-b9fce71bf68768ee86ce128f353fea5533f50732.tar.zst cuberite-b9fce71bf68768ee86ce128f353fea5533f50732.zip | |
Diffstat (limited to 'src/Items')
| -rw-r--r-- | src/Items/ItemHandler.cpp | 1 | ||||
| -rw-r--r-- | src/Items/ItemShears.h | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp index cd391480c..136bc3096 100644 --- a/src/Items/ItemHandler.cpp +++ b/src/Items/ItemHandler.cpp @@ -95,6 +95,7 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType) // Single item per handler, alphabetically sorted: case E_BLOCK_LEAVES: return new cItemLeavesHandler(a_ItemType); + case E_BLOCK_NEW_LEAVES: return new cItemLeavesHandler(a_ItemType); case E_BLOCK_SAPLING: return new cItemSaplingHandler(a_ItemType); case E_BLOCK_WOOL: return new cItemClothHandler(a_ItemType); case E_ITEM_BED: return new cItemBedHandler(a_ItemType); diff --git a/src/Items/ItemShears.h b/src/Items/ItemShears.h index b8f75f5ba..39d2776fa 100644 --- a/src/Items/ItemShears.h +++ b/src/Items/ItemShears.h @@ -28,10 +28,10 @@ public: virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override { BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ); - if (Block == E_BLOCK_LEAVES) + if ((Block == E_BLOCK_LEAVES) || (Block == E_BLOCK_NEW_LEAVES)) { cItems Drops; - Drops.push_back(cItem(E_BLOCK_LEAVES, 1, a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) & 0x03)); + Drops.push_back(cItem(Block, 1, a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) & 0x03)); a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ); a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0); @@ -49,6 +49,7 @@ public: case E_BLOCK_COBWEB: case E_BLOCK_VINES: case E_BLOCK_LEAVES: + case E_BLOCK_NEW_LEAVES: { return true; } |