diff options
| author | KingCol13 <48412633+KingCol13@users.noreply.github.com> | 2020-09-20 20:06:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-20 20:06:28 +0200 |
| commit | b6b7fb1a6549ba0c92c5db141af6f6f9bc1d3038 (patch) | |
| tree | 709d341446623a083202a955f6e9a7105784ab5e /src/Blocks/BlockSeaLantern.h | |
| parent | IBM Z (#4892) (diff) | |
| download | cuberite-b6b7fb1a6549ba0c92c5db141af6f6f9bc1d3038.tar cuberite-b6b7fb1a6549ba0c92c5db141af6f6f9bc1d3038.tar.gz cuberite-b6b7fb1a6549ba0c92c5db141af6f6f9bc1d3038.tar.bz2 cuberite-b6b7fb1a6549ba0c92c5db141af6f6f9bc1d3038.tar.lz cuberite-b6b7fb1a6549ba0c92c5db141af6f6f9bc1d3038.tar.xz cuberite-b6b7fb1a6549ba0c92c5db141af6f6f9bc1d3038.tar.zst cuberite-b6b7fb1a6549ba0c92c5db141af6f6f9bc1d3038.zip | |
Diffstat (limited to 'src/Blocks/BlockSeaLantern.h')
| -rw-r--r-- | src/Blocks/BlockSeaLantern.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/Blocks/BlockSeaLantern.h b/src/Blocks/BlockSeaLantern.h index c24476e0b..1fab10a11 100644 --- a/src/Blocks/BlockSeaLantern.h +++ b/src/Blocks/BlockSeaLantern.h @@ -6,7 +6,6 @@ - class cBlockSeaLanternHandler : public cBlockHandler { @@ -20,8 +19,18 @@ private: virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) const override { - // Reset meta to 0 - // TODO: Handle the Fortune enchantment - return cItem(E_ITEM_PRISMARINE_CRYSTALS, GetRandomProvider().RandInt<char>(2, 3), 0); + // Drop self only when using silk-touch: + if (ToolHasSilkTouch(a_Tool)) + { + return cItem(E_BLOCK_SEA_LANTERN, 1, 0); + } + else + { + unsigned int DropNum = GetRandomProvider().RandInt<char>(2, 3 + ToolFortuneLevel(a_Tool)); + // cap the dropnum to the max amount of 5 + DropNum = std::min<unsigned int>(DropNum, 5); + // Reset meta to 0 + return cItem(E_ITEM_PRISMARINE_CRYSTALS, DropNum, 0); + } } } ; |