summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-12-08 15:07:32 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-12-08 15:07:32 +0100
commit9c1b7c8b6e43d740c55e75ec594dce2ea482f11e (patch)
tree07cc982f5221597d70f93a14899032443977a50f /src
parentMerge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures (diff)
downloadcuberite-9c1b7c8b6e43d740c55e75ec594dce2ea482f11e.tar
cuberite-9c1b7c8b6e43d740c55e75ec594dce2ea482f11e.tar.gz
cuberite-9c1b7c8b6e43d740c55e75ec594dce2ea482f11e.tar.bz2
cuberite-9c1b7c8b6e43d740c55e75ec594dce2ea482f11e.tar.lz
cuberite-9c1b7c8b6e43d740c55e75ec594dce2ea482f11e.tar.xz
cuberite-9c1b7c8b6e43d740c55e75ec594dce2ea482f11e.tar.zst
cuberite-9c1b7c8b6e43d740c55e75ec594dce2ea482f11e.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockHandler.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index 37d948d79..99559ed02 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -48,6 +48,7 @@
#include "BlockPumpkin.h"
#include "BlockRail.h"
#include "BlockRedstone.h"
+#include "BlockRedstoneLamp.h"
#include "BlockRedstoneRepeater.h"
#include "BlockRedstoneTorch.h"
#include "BlockSand.h"
@@ -169,6 +170,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
case E_BLOCK_PUMPKIN_STEM: return new cBlockStemsHandler (a_BlockType);
case E_BLOCK_QUARTZ_STAIRS: return new cBlockStairsHandler (a_BlockType);
case E_BLOCK_RAIL: return new cBlockRailHandler (a_BlockType);
+ case E_BLOCK_REDSTONE_LAMP_ON: return new cBlockRedstoneLampHandler (a_BlockType); // We need this to change pickups to an off lamp; else 1.7+ clients crash
case E_BLOCK_REDSTONE_ORE: return new cBlockOreHandler (a_BlockType);
case E_BLOCK_REDSTONE_ORE_GLOWING: return new cBlockOreHandler (a_BlockType);
case E_BLOCK_REDSTONE_REPEATER_OFF: return new cBlockRedstoneRepeaterHandler(a_BlockType);