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

Merge branch 'bugfixes' of git://github.com/tigerw/MCServer into tigerw-bugfixes

Browse Source 
Conflicts:
	source/Blocks/BlockTorch.h
This commit is contained in:
madmaxoft
2013-09-15 20:34:22 +02:00
parent f0ab45f65c 526c769b6a
commit 4e200df18c
22 changed files with 165 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/Blocks/BlockHandler.cpp
View File

@@ -157,7 +157,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
case E_BLOCK_PUMPKIN: return new cBlockPumpkinHandler (a_BlockType);
case E_BLOCK_JACK_O_LANTERN: return new cBlockPumpkinHandler (a_BlockType);
case E_BLOCK_PUMPKIN_STEM: return new cBlockStemsHandler (a_BlockType);
case E_BLOCK_QUARTZ_STAIR: return new cBlockStairsHandler (a_BlockType);
case E_BLOCK_QUARTZ_STAIRS: return new cBlockStairsHandler (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);
@@ -407,24 +407,6 @@ bool cBlockHandler::DoesIgnoreBuildCollision(void)
bool cBlockHandler::DoesAllowBlockOnTop(void)
{
return true;
}
bool cBlockHandler::CanBePlacedOnSide(void)
{
return true;
}
bool cBlockHandler::DoesDropOnUnsuitable(void)
{
return true;