diff options
| author | Mattes D <github@xoft.cz> | 2019-10-16 10:06:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 10:06:34 +0200 |
| commit | 221cc4ec5cb6301743e947eaabed3fecedba796f (patch) | |
| tree | 4e44c8bb7523e5d1d04468fc906ae24674c10abc /src/Blocks/BlockCocoaPod.h | |
| parent | Fixed crash in hopper while pulling items from blockentity above itself (#4412) (diff) | |
| download | cuberite-221cc4ec5cb6301743e947eaabed3fecedba796f.tar cuberite-221cc4ec5cb6301743e947eaabed3fecedba796f.tar.gz cuberite-221cc4ec5cb6301743e947eaabed3fecedba796f.tar.bz2 cuberite-221cc4ec5cb6301743e947eaabed3fecedba796f.tar.lz cuberite-221cc4ec5cb6301743e947eaabed3fecedba796f.tar.xz cuberite-221cc4ec5cb6301743e947eaabed3fecedba796f.tar.zst cuberite-221cc4ec5cb6301743e947eaabed3fecedba796f.zip | |
Diffstat (limited to 'src/Blocks/BlockCocoaPod.h')
| -rw-r--r-- | src/Blocks/BlockCocoaPod.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/Blocks/BlockCocoaPod.h b/src/Blocks/BlockCocoaPod.h index 4a1fb8c10..2d5243995 100644 --- a/src/Blocks/BlockCocoaPod.h +++ b/src/Blocks/BlockCocoaPod.h @@ -44,12 +44,21 @@ public: } } - virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override + + + + + virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override { - int GrowState = a_BlockMeta >> 2; - a_Pickups.Add(E_ITEM_DYE, ((GrowState >= 2) ? 3 : 1), E_META_DYE_BROWN); + // If fully grown, give 3 items, otherwise just one: + auto growState = a_BlockMeta >> 2; + return cItem(E_ITEM_DYE, ((growState >= 2) ? 3 : 1), E_META_DYE_BROWN); } + + + + static eBlockFace MetaToBlockFace(NIBBLETYPE a_Meta) { switch (a_Meta & 0x3) |