flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Added dead bush block handler so a dead bush pickup is dropped when the sand underneath it is removed.

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1569 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
faketruth 2013-06-09 15:16:07 +00:00
parent 1ca637f660
commit 3ccba12e39
3 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
VC2008/MCServer.vcproj
View File

@ -1812,6 +1812,10 @@
RelativePath="..\source\blocks\BlockCrops.h"
>
</File>
<File
RelativePath="..\source\Blocks\BlockDeadBush.h"
>
</File>
<File
RelativePath="..\source\blocks\BlockDirt.h"
>

47
source/Blocks/BlockDeadBush.h Normal file
View File

@ -0,0 +1,47 @@
#pragma once
#include "BlockHandler.h"
#include "../World.h"
class cBlockDeadBushHandler :
public cBlockHandler
{
public:
cBlockDeadBushHandler(BLOCKTYPE a_BlockType)
: cBlockHandler(a_BlockType)
{
}
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
a_Pickups.push_back(cItem(E_BLOCK_DEAD_BUSH, 1, a_BlockMeta));
}
virtual bool CanBeAt(int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
{
return (a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) == E_BLOCK_SAND);
}
virtual bool DoesAllowBlockOnTop(void) override
{
return false;
}
virtual bool CanBePlacedOnSide() override
{
return false;
}
} ;

2
source/Blocks/BlockHandler.cpp
View File

@ -57,6 +57,7 @@
#include "BlockBrewingStand.h"
#include "BlockCobWeb.h"
#include "BlockTNT.h"
#include "BlockDeadBush.h"
@ -149,6 +150,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
case E_BLOCK_RAIL: return new cBlockRailHandler (a_BlockType);
case E_BLOCK_POTATOES: return new cBlockCropsHandler (a_BlockType);
case E_BLOCK_POWERED_RAIL: return new cBlockRailHandler (a_BlockType);
case E_BLOCK_DEAD_BUSH: return new cBlockDeadBushHandler (a_BlockType);
case E_BLOCK_DETECTOR_RAIL: return new cBlockRailHandler (a_BlockType);
case E_BLOCK_REDSTONE_ORE: return new cBlockOreHandler (a_BlockType);
case E_BLOCK_REDSTONE_ORE_GLOWING: return new cBlockOreHandler (a_BlockType);