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/BlockBrewingStand.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/Blocks/BlockBrewingStand.h') diff --git a/src/Blocks/BlockBrewingStand.h b/src/Blocks/BlockBrewingStand.h index e23a60b67..27ba33ca7 100644 --- a/src/Blocks/BlockBrewingStand.h +++ b/src/Blocks/BlockBrewingStand.h @@ -1,7 +1,6 @@ #pragma once -#include "../BlockEntities/BrewingstandEntity.h" #include "Mixins.h" @@ -19,15 +18,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_ITEM_BREWING_STAND, 1)); // We have to drop the item form of a brewing stand - if (a_BlockEntity != nullptr) - { - auto be = static_cast(a_BlockEntity); - res.AddItemGrid(be->GetContents()); - } - return res; + return cItem(E_ITEM_BREWING_STAND); // We have to drop the item form of a brewing stand } -- cgit v1.2.3