diff options
| author | luksor111@gmail.com <luksor111@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-11-27 20:55:23 +0100 |
|---|---|---|
| committer | luksor111@gmail.com <luksor111@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-11-27 20:55:23 +0100 |
| commit | 8ca150b7009119fbf46f9b6c6376b63d19f836de (patch) | |
| tree | a7cc11b1246ec11c8621d425023ad1895a31e4eb /source/Blocks | |
| parent | Furnace now lights up when smelting items (diff) | |
| download | cuberite-8ca150b7009119fbf46f9b6c6376b63d19f836de.tar cuberite-8ca150b7009119fbf46f9b6c6376b63d19f836de.tar.gz cuberite-8ca150b7009119fbf46f9b6c6376b63d19f836de.tar.bz2 cuberite-8ca150b7009119fbf46f9b6c6376b63d19f836de.tar.lz cuberite-8ca150b7009119fbf46f9b6c6376b63d19f836de.tar.xz cuberite-8ca150b7009119fbf46f9b6c6376b63d19f836de.tar.zst cuberite-8ca150b7009119fbf46f9b6c6376b63d19f836de.zip | |
Diffstat (limited to 'source/Blocks')
| -rw-r--r-- | source/Blocks/BlockEnderchest.h | 28 | ||||
| -rw-r--r-- | source/Blocks/BlockHandler.cpp | 2 | ||||
| -rw-r--r-- | source/Blocks/BlockMycelium.h | 2 |
3 files changed, 30 insertions, 2 deletions
diff --git a/source/Blocks/BlockEnderchest.h b/source/Blocks/BlockEnderchest.h new file mode 100644 index 000000000..b40deb1f7 --- /dev/null +++ b/source/Blocks/BlockEnderchest.h @@ -0,0 +1,28 @@ +
+#pragma once
+
+#include "BlockHandler.h"
+
+
+
+
+
+class cBlockEnderchestHandler :
+ public cBlockHandler
+{
+public:
+ cBlockEnderchestHandler(BLOCKTYPE a_BlockType)
+ : cBlockHandler(a_BlockType)
+ {
+ }
+
+ virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
+ {
+ //todo: Drop Ender Chest if using silk touch pickaxe
+ a_Pickups.push_back(cItem(E_BLOCK_OBSIDIAN, 8, 0));
+ }
+} ;
+
+
+
+
diff --git a/source/Blocks/BlockHandler.cpp b/source/Blocks/BlockHandler.cpp index 3f63de89f..3fb96f6a0 100644 --- a/source/Blocks/BlockHandler.cpp +++ b/source/Blocks/BlockHandler.cpp @@ -47,6 +47,7 @@ #include "BlockMycelium.h"
#include "BlockRail.h"
#include "BlockGlass.h"
+#include "BlockEnderchest.h"
@@ -100,6 +101,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType) case E_BLOCK_DOUBLE_STONE_SLAB: return new cBlockSlabHandler (a_BlockType);
case E_BLOCK_DOUBLE_WOODEN_SLAB: return new cBlockSlabHandler (a_BlockType);
case E_BLOCK_EMERALD_ORE: return new cBlockOreHandler (a_BlockType);
+ case E_BLOCK_ENDER_CHEST: return new cBlockEnderchestHandler (a_BlockType);
case E_BLOCK_FARMLAND: return new cBlockFarmlandHandler;
case E_BLOCK_FIRE: return new cBlockFireHandler (a_BlockType);
case E_BLOCK_FURNACE: return new cBlockFurnaceHandler (a_BlockType);
diff --git a/source/Blocks/BlockMycelium.h b/source/Blocks/BlockMycelium.h index 57b45dfe1..8e1f577e1 100644 --- a/source/Blocks/BlockMycelium.h +++ b/source/Blocks/BlockMycelium.h @@ -2,8 +2,6 @@ #pragma once
#include "BlockHandler.h"
-#include "../MersenneTwister.h"
-#include "../World.h"
|