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/BlockMobHead.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/Blocks/BlockMobHead.h') diff --git a/src/Blocks/BlockMobHead.h b/src/Blocks/BlockMobHead.h index 71fb6c958..fb81a07d8 100644 --- a/src/Blocks/BlockMobHead.h +++ b/src/Blocks/BlockMobHead.h @@ -2,7 +2,6 @@ #pragma once #include "BlockEntity.h" -#include "../BlockEntities/MobHeadEntity.h" @@ -19,14 +18,10 @@ public: 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_HEAD)) - { - return {}; - } - auto mobHeadEntity = static_cast(a_BlockEntity); - return cItem(E_ITEM_HEAD, 1, static_cast(mobHeadEntity->GetType())); + // Drops handled by the block entity: + return {}; } -- cgit v1.2.3