summaryrefslogtreecommitdiffstats
path: root/src/Blocks
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-01-19 22:47:52 +0100
committerMattes D <github@xoft.cz>2014-01-19 22:47:52 +0100
commitfde8b0be60fb58796727d240ceab48a5e2aa0b88 (patch)
treec7c97ced908edb8d0a719032fb3b9eaff9d7ca7c /src/Blocks
parentRewritten SocketThreads for proper shutdown scenario. (diff)
parentRemoved unneeded paramters (diff)
downloadcuberite-fde8b0be60fb58796727d240ceab48a5e2aa0b88.tar
cuberite-fde8b0be60fb58796727d240ceab48a5e2aa0b88.tar.gz
cuberite-fde8b0be60fb58796727d240ceab48a5e2aa0b88.tar.bz2
cuberite-fde8b0be60fb58796727d240ceab48a5e2aa0b88.tar.lz
cuberite-fde8b0be60fb58796727d240ceab48a5e2aa0b88.tar.xz
cuberite-fde8b0be60fb58796727d240ceab48a5e2aa0b88.tar.zst
cuberite-fde8b0be60fb58796727d240ceab48a5e2aa0b88.zip
Diffstat (limited to 'src/Blocks')
-rw-r--r--src/Blocks/BlockCommandBlock.h32
-rw-r--r--src/Blocks/BlockHandler.cpp2
2 files changed, 34 insertions, 0 deletions
diff --git a/src/Blocks/BlockCommandBlock.h b/src/Blocks/BlockCommandBlock.h
new file mode 100644
index 000000000..cf0103765
--- /dev/null
+++ b/src/Blocks/BlockCommandBlock.h
@@ -0,0 +1,32 @@
+
+#pragma once
+
+#include "BlockEntity.h"
+
+
+
+
+
+class cBlockCommandBlockHandler :
+ public cBlockEntityHandler
+{
+public:
+ cBlockCommandBlockHandler(BLOCKTYPE a_BlockType)
+ : cBlockEntityHandler(a_BlockType)
+ {
+ }
+
+ virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
+ {
+ a_Pickups.push_back(cItem(E_BLOCK_AIR, 8, 0));
+ }
+
+ virtual const char * GetStepSound(void) override
+ {
+ return "step.stone";
+ }
+} ;
+
+
+
+
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index ff1022e12..b9c0887ce 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -14,6 +14,7 @@
#include "BlockChest.h"
#include "BlockCloth.h"
#include "BlockCobWeb.h"
+#include "BlockCommandBlock.h"
#include "BlockComparator.h"
#include "BlockCrops.h"
#include "BlockDeadBush.h"
@@ -116,6 +117,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
case E_BLOCK_CAULDRON: return new cBlockCauldronHandler (a_BlockType);
case E_BLOCK_CHEST: return new cBlockChestHandler (a_BlockType);
case E_BLOCK_COAL_ORE: return new cBlockOreHandler (a_BlockType);
+ case E_BLOCK_COMMAND_BLOCK: return new cBlockCommandBlockHandler (a_BlockType);
case E_BLOCK_ACTIVE_COMPARATOR: return new cBlockComparatorHandler (a_BlockType);
case E_BLOCK_COBBLESTONE: return new cBlockStoneHandler (a_BlockType);
case E_BLOCK_COBBLESTONE_STAIRS: return new cBlockStairsHandler (a_BlockType);