summaryrefslogtreecommitdiffstats
path: root/src/Blocks
diff options
context:
space:
mode:
authorMat <mail@mathias.is>2020-03-23 14:45:09 +0100
committerGitHub <noreply@github.com>2020-03-23 14:45:09 +0100
commitf5d24746d662f12b0446d82b0e49f7dec495c748 (patch)
tree7bed8eab2c49f2985ef5e3e0ceaea7dbd3d2df13 /src/Blocks
parentUpdate .gitignore; new files added to APIDump are no longer ignored (diff)
downloadcuberite-f5d24746d662f12b0446d82b0e49f7dec495c748.tar
cuberite-f5d24746d662f12b0446d82b0e49f7dec495c748.tar.gz
cuberite-f5d24746d662f12b0446d82b0e49f7dec495c748.tar.bz2
cuberite-f5d24746d662f12b0446d82b0e49f7dec495c748.tar.lz
cuberite-f5d24746d662f12b0446d82b0e49f7dec495c748.tar.xz
cuberite-f5d24746d662f12b0446d82b0e49f7dec495c748.tar.zst
cuberite-f5d24746d662f12b0446d82b0e49f7dec495c748.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockHandler.cpp3
-rw-r--r--src/Blocks/BlockJukebox.h36
2 files changed, 38 insertions, 1 deletions
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;
+ }
+} ;
+
+
+
+