summaryrefslogtreecommitdiffstats
path: root/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2016-06-16 21:54:09 +0200
committerGitHub <noreply@github.com>2016-06-16 21:54:09 +0200
commitec998e821fd905966ed14ed47a29520ec1d1d782 (patch)
treeb61d763a27e1986116c1a2f3b779bcf0bb1bd27b /src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp
parentMerge pull request #3227 from cuberite/NormalizeVectorApi (diff)
parent- Add a activation flag to droppers and dispensers. Previously droppers and dispensers shot items with every block update. (diff)
downloadcuberite-ec998e821fd905966ed14ed47a29520ec1d1d782.tar
cuberite-ec998e821fd905966ed14ed47a29520ec1d1d782.tar.gz
cuberite-ec998e821fd905966ed14ed47a29520ec1d1d782.tar.bz2
cuberite-ec998e821fd905966ed14ed47a29520ec1d1d782.tar.lz
cuberite-ec998e821fd905966ed14ed47a29520ec1d1d782.tar.xz
cuberite-ec998e821fd905966ed14ed47a29520ec1d1d782.tar.zst
cuberite-ec998e821fd905966ed14ed47a29520ec1d1d782.zip
Diffstat (limited to 'src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp')
-rw-r--r--src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp b/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp
index 9f8c0f39d..c7be24dc4 100644
--- a/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp
+++ b/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp
@@ -196,12 +196,12 @@ void cIncrementalRedstoneSimulator::Simulate(float a_dt)
cRedstoneHandler::PoweringData Power;
for (const auto & Location : CurrentHandler->GetValidSourcePositions(CurrentLocation, CurrentBlock, CurrentMeta))
{
- BLOCKTYPE PotentialBlock;
- NIBBLETYPE PotentialMeta;
- if ((Location.y < 0) || (Location.y > cChunkDef::Height))
+ if (!cChunk::IsValidHeight(Location.y))
{
continue;
}
+ BLOCKTYPE PotentialBlock;
+ NIBBLETYPE PotentialMeta;
m_World.GetBlockTypeMeta(Location.x, Location.y, Location.z, PotentialBlock, PotentialMeta);
auto PotentialSourceHandler = cIncrementalRedstoneSimulator::CreateComponent(m_World, PotentialBlock, &m_Data);