From 221cc4ec5cb6301743e947eaabed3fecedba796f Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Wed, 16 Oct 2019 10:06:34 +0200
Subject: Refactored block-to-pickup conversion. (#4417)

---
 src/Blocks/BlockFurnace.h | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'src/Blocks/BlockFurnace.h')

diff --git a/src/Blocks/BlockFurnace.h b/src/Blocks/BlockFurnace.h
index ea1779c41..4a0459bf0 100644
--- a/src/Blocks/BlockFurnace.h
+++ b/src/Blocks/BlockFurnace.h
@@ -3,25 +3,27 @@
 
 #include "BlockEntity.h"
 #include "../Blocks/BlockPiston.h"
-#include "MetaRotator.h"
+#include "Mixins.h"
 
 
 
 
 class cBlockFurnaceHandler :
-	public cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>
+	public cClearMetaOnDrop<cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>>
 {
+	using super = cClearMetaOnDrop<cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>>;
+
 public:
-	cBlockFurnaceHandler(BLOCKTYPE a_BlockType)
-		: cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>(a_BlockType)
-	{
-	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
+	cBlockFurnaceHandler(BLOCKTYPE a_BlockType):
+		super(a_BlockType)
 	{
-		a_Pickups.push_back(cItem(E_BLOCK_FURNACE, 1, 0));
 	}
 
+
+
+
+
 	virtual bool GetPlacementBlockTypeMeta(
 		cChunkInterface & a_ChunkInterface, cPlayer & a_Player,
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
@@ -37,6 +39,10 @@ public:
 		return true;
 	}
 
+
+
+
+
 	virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override
 	{
 		UNUSED(a_Meta);
-- 
cgit v1.2.3