summaryrefslogtreecommitdiffstats
path: root/src/Simulator
diff options
context:
space:
mode:
authorQUSpilPrgm <QUSpilPrgm@users.noreply.github.com>2016-05-28 22:48:36 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2016-05-28 22:48:36 +0200
commita567b36a8a6574208b30f8a22d3240d13a01bf63 (patch)
tree7279433fa84ace2f64446e79cb121c4cda6f92c5 /src/Simulator
parentMade redstone handlers static (diff)
downloadcuberite-a567b36a8a6574208b30f8a22d3240d13a01bf63.tar
cuberite-a567b36a8a6574208b30f8a22d3240d13a01bf63.tar.gz
cuberite-a567b36a8a6574208b30f8a22d3240d13a01bf63.tar.bz2
cuberite-a567b36a8a6574208b30f8a22d3240d13a01bf63.tar.lz
cuberite-a567b36a8a6574208b30f8a22d3240d13a01bf63.tar.xz
cuberite-a567b36a8a6574208b30f8a22d3240d13a01bf63.tar.zst
cuberite-a567b36a8a6574208b30f8a22d3240d13a01bf63.zip
Diffstat (limited to '')
-rw-r--r--src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp2
-rw-r--r--src/Simulator/IncrementalRedstoneSimulator/RedstoneBlockHandler.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp b/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp
index 16c47c993..9f8c0f39d 100644
--- a/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp
+++ b/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp
@@ -36,7 +36,7 @@ cRedstoneHandler * cIncrementalRedstoneSimulator::CreateComponent(cWorld & a_Wor
{
case E_BLOCK_ACTIVATOR_RAIL:
case E_BLOCK_DETECTOR_RAIL:
- case E_BLOCK_POWERED_RAIL:
+ case E_BLOCK_POWERED_RAIL:
{
static cPoweredRailHandler ComponentHandler(a_World);
return &ComponentHandler;
diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneBlockHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneBlockHandler.h
index ee8cfe431..18a775b7d 100644
--- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneBlockHandler.h
+++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneBlockHandler.h
@@ -23,8 +23,7 @@ public:
UNUSED(a_BlockType);
UNUSED(a_Meta);
UNUSED(a_QueryPosition);
- UNUSED(a_QueryBlockType);
- return 15;
+ return cIncrementalRedstoneSimulator::IsMechanism(a_QueryBlockType) ? 15 : 0;
}
virtual unsigned char GetPowerLevel(const Vector3i & a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta) override