From f5d24746d662f12b0446d82b0e49f7dec495c748 Mon Sep 17 00:00:00 2001
From: Mat <mail@mathias.is>
Date: Mon, 23 Mar 2020 15:45:09 +0200
Subject: Jukebox improvements (#4537)

* Add jukebox block handler

Co-authored-by: peterbell10 <peterbell10@live.co.uk>
---
 src/Blocks/BlockHandler.cpp |  3 ++-
 src/Blocks/BlockJukebox.h   | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 src/Blocks/BlockJukebox.h

(limited to 'src/Blocks')

diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index a865bce63..60241b0ae 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -45,6 +45,7 @@
 #include "BlockMobHead.h"
 #include "BlockHopper.h"
 #include "BlockIce.h"
+#include "BlockJukebox.h"
 #include "BlockLadder.h"
 #include "BlockLeaves.h"
 #include "BlockLilypad.h"
@@ -259,7 +260,7 @@ static cBlockHandler * CreateBlockHandler(BLOCKTYPE a_BlockType)
 		case E_BLOCK_IRON_ORE:                      return new cBlockOreHandler             (a_BlockType);
 		case E_BLOCK_IRON_TRAPDOOR:                 return new cBlockTrapdoorHandler        (a_BlockType);
 		case E_BLOCK_JACK_O_LANTERN:                return new cBlockPumpkinHandler         (a_BlockType);
-		case E_BLOCK_JUKEBOX:                       return new cBlockEntityHandler          (a_BlockType);
+		case E_BLOCK_JUKEBOX:                       return new cBlockJukeboxHandler         (a_BlockType);
 		case E_BLOCK_JUNGLE_DOOR:                   return new cBlockDoorHandler            (a_BlockType);
 		case E_BLOCK_JUNGLE_FENCE:                  return new cBlockFenceHandler           (a_BlockType);
 		case E_BLOCK_JUNGLE_FENCE_GATE:             return new cBlockFenceGateHandler       (a_BlockType);
diff --git a/src/Blocks/BlockJukebox.h b/src/Blocks/BlockJukebox.h
new file mode 100644
index 000000000..22b02a2c7
--- /dev/null
+++ b/src/Blocks/BlockJukebox.h
@@ -0,0 +1,36 @@
+
+#pragma once
+
+#include "BlockEntity.h"
+#include "Mixins.h"
+
+
+
+
+
+class cBlockJukeboxHandler :
+	public cClearMetaOnDrop<cBlockEntityHandler>
+{
+	using super = cClearMetaOnDrop<cBlockEntityHandler>;
+
+public:
+
+	cBlockJukeboxHandler(BLOCKTYPE a_BlockType):
+		super(a_BlockType)
+	{
+	}
+
+
+
+
+
+	virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override
+	{
+		UNUSED(a_Meta);
+		return 6;
+	}
+} ;
+
+
+
+
-- 
cgit v1.2.3