From 33cd7f4e75819d50f22ae61027373ebb331305b5 Mon Sep 17 00:00:00 2001 From: QUSpilPrgm Date: Sat, 4 Jun 2016 14:16:35 +0200 Subject: - Add a activation flag to droppers and dispensers. Previously droppers and dispensers shot items with every block update. - Fixes a range check inside cIncrementalRedstoneSimulator::Simulate --- .../IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp') 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); -- cgit v1.2.3