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/BlockFurnace.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/Blocks/BlockFurnace.h') diff --git a/src/Blocks/BlockFurnace.h b/src/Blocks/BlockFurnace.h index 781843f5a..2c88cfafd 100644 --- a/src/Blocks/BlockFurnace.h +++ b/src/Blocks/BlockFurnace.h @@ -1,8 +1,6 @@ #pragma once -#include "../Blocks/BlockPiston.h" -#include "../BlockEntities/FurnaceEntity.h" #include "Mixins.h" @@ -19,15 +17,9 @@ 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 { - cItems res(cItem(E_BLOCK_FURNACE, 1)); // We can't drop a lit furnace - if (a_BlockEntity != nullptr) - { - auto be = static_cast(a_BlockEntity); - res.AddItemGrid(be->GetContents()); - } - return res; + return cItem(E_BLOCK_FURNACE); // We can't drop a lit furnace } -- cgit v1.2.3