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/BlockHandler.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/Blocks/BlockHandler.cpp') diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp index f2eb4f966..371f34ec0 100644 --- a/src/Blocks/BlockHandler.cpp +++ b/src/Blocks/BlockHandler.cpp @@ -522,21 +522,13 @@ void cBlockHandler::NeighborChanged(cChunkInterface & a_ChunkInterface, Vector3i -cItems cBlockHandler::ConvertToPickups( - NIBBLETYPE a_BlockMeta, - cBlockEntity * a_BlockEntity, - const cEntity * a_Digger, - const cItem * a_Tool -) const +cItems cBlockHandler::ConvertToPickups(NIBBLETYPE a_BlockMeta, const cEntity * a_Digger, const cItem * a_Tool) const { - UNUSED(a_BlockEntity); UNUSED(a_Digger); UNUSED(a_Tool); // Add self: - cItems res; - res.push_back(cItem(m_BlockType, 1, a_BlockMeta)); - return res; + return cItem(m_BlockType, 1, a_BlockMeta); } -- cgit v1.2.3