From 8ca150b7009119fbf46f9b6c6376b63d19f836de Mon Sep 17 00:00:00 2001 From: "luksor111@gmail.com" Date: Tue, 27 Nov 2012 19:55:23 +0000 Subject: Added initial adventure mode support Added missing Emerald crafting recipe You get more fall damage when jumping Torch no longer protects players from fall damage Fixed Ender Chest drops git-svn-id: http://mc-server.googlecode.com/svn/trunk@1070 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Blocks/BlockEnderchest.h | 28 ++++++++++++++++++++++++++++ source/Blocks/BlockHandler.cpp | 2 ++ source/Blocks/BlockMycelium.h | 2 -- 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 source/Blocks/BlockEnderchest.h (limited to 'source/Blocks') 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" -- cgit v1.2.3