summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockHandler.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-08-20 16:23:31 +0200
committerMattes D <github@xoft.cz>2014-08-20 16:23:31 +0200
commit5410a36f92c1c94f25552dff4a46b9611f0cb917 (patch)
tree920627577c09fd3270b08bab3e7a6d3d29d52025 /src/Blocks/BlockHandler.cpp
parentPlayer: Silenced a few type conversion warnings. (diff)
parentRemoved old classes from the CMakeLists.txt (diff)
downloadcuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar
cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.gz
cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.bz2
cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.lz
cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.xz
cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.zst
cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.zip
Diffstat (limited to 'src/Blocks/BlockHandler.cpp')
-rw-r--r--src/Blocks/BlockHandler.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index 52f7dd608..028277e4c 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -45,13 +45,11 @@
#include "BlockLadder.h"
#include "BlockLeaves.h"
#include "BlockLilypad.h"
-#include "BlockNewLeaves.h"
#include "BlockLever.h"
#include "BlockMelon.h"
#include "BlockMushroom.h"
#include "BlockMycelium.h"
#include "BlockNetherWart.h"
-#include "BlockNote.h"
#include "BlockOre.h"
#include "BlockPiston.h"
#include "BlockPlanks.h"
@@ -251,9 +249,9 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
case E_BLOCK_NETHER_PORTAL: return new cBlockPortalHandler (a_BlockType);
case E_BLOCK_NETHER_WART: return new cBlockNetherWartHandler (a_BlockType);
case E_BLOCK_NETHER_QUARTZ_ORE: return new cBlockOreHandler (a_BlockType);
- case E_BLOCK_NEW_LEAVES: return new cBlockNewLeavesHandler (a_BlockType);
+ case E_BLOCK_NEW_LEAVES: return new cBlockLeavesHandler (a_BlockType);
case E_BLOCK_NEW_LOG: return new cBlockSidewaysHandler (a_BlockType);
- case E_BLOCK_NOTE_BLOCK: return new cBlockNoteHandler (a_BlockType);
+ case E_BLOCK_NOTE_BLOCK: return new cBlockEntityHandler (a_BlockType);
case E_BLOCK_PISTON: return new cBlockPistonHandler (a_BlockType);
case E_BLOCK_PISTON_EXTENSION: return new cBlockPistonHeadHandler;
case E_BLOCK_PLANKS: return new cBlockPlanksHandler (a_BlockType);