From c53a0ba5f6f71da384a45a07685f8e25c3f91a29 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Wed, 23 Sep 2020 16:06:27 +0100 Subject: Unify block entity pickup conversion - Removed normal BlockHandler knowledge of block entities during conversion + Added cBlockEntity::ConvertToPickups that handles it --- src/Blocks/BlockEnchantingTable.h | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/Blocks/BlockEnchantingTable.h') diff --git a/src/Blocks/BlockEnchantingTable.h b/src/Blocks/BlockEnchantingTable.h index a03ae7a2a..5edf9fdda 100644 --- a/src/Blocks/BlockEnchantingTable.h +++ b/src/Blocks/BlockEnchantingTable.h @@ -62,17 +62,10 @@ private: } - virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) const override + virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, const cEntity * a_Digger, const cItem * a_Tool) const override { - if ((a_BlockEntity == nullptr) || (a_BlockEntity->GetBlockType() != E_BLOCK_ENCHANTMENT_TABLE)) - { - return {}; - } - - auto & EnchantingTable = static_cast(*a_BlockEntity); - cItem Item = cItem(E_BLOCK_ENCHANTMENT_TABLE); - Item.m_CustomName = EnchantingTable.GetCustomName(); - return Item; + // Drops handled by the block entity: + return {}; } -- cgit v1.2.3