From 40eba5244ddd7045a9c3539c5f46c9921301ed90 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 8 Aug 2020 18:22:16 +0100 Subject: Remove the redstone solid block handler - Remove cSolidBlockHandler * Functionality now integrated into simulator dispatcher * Fix door double open/close issues, arisen due to the top/bottom halves getting different power + Small migration to block states for redstone wire --- .../IncrementalRedstoneSimulator/DoorHandler.h | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h') diff --git a/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h b/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h index c91886f4e..7011b852b 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h @@ -10,16 +10,16 @@ class cDoorHandler final : public cRedstoneHandler { -public: + // "Doormammu, I've come to bargain" - virtual unsigned char GetPowerDeliveredToPosition(cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType) const override + virtual unsigned char GetPowerDeliveredToPosition(const cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_BlockType, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType, bool IsLinked) const override { UNUSED(a_Chunk); UNUSED(a_Position); UNUSED(a_BlockType); - UNUSED(a_Meta); UNUSED(a_QueryPosition); UNUSED(a_QueryBlockType); + UNUSED(IsLinked); return 0; } @@ -27,6 +27,19 @@ public: { // LOGD("Evaluating dori the door (%d %d %d)", a_Position.x, a_Position.y, a_Position.z); + if ((a_Meta & 0x8) == 0x8) + { + // We're treating the bottom half as the source of truth, so ignore updates to the top: + return; + } + + const auto TopPosition = a_Position + OffsetYP; + ForEachSourceCallback Callback(a_Chunk, TopPosition, a_BlockType); + ForValidSourcePositions(a_Chunk, TopPosition, a_BlockType, a_Meta, Callback); + + // Factor in what the upper half is getting: + a_PoweringData = std::max(a_PoweringData, Callback.Power); + cChunkInterface ChunkInterface(a_Chunk.GetWorld()->GetChunkMap()); const bool ShouldBeOpen = a_PoweringData.PowerLevel != 0; const auto AbsolutePosition = cChunkDef::RelativeToAbsolute(a_Position, a_Chunk.GetPos()); @@ -39,7 +52,7 @@ public: } } - virtual void ForValidSourcePositions(cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, SourceCallback Callback) const override + virtual void ForValidSourcePositions(const cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, SourceCallback Callback) const override { UNUSED(a_Chunk); UNUSED(a_BlockType); -- cgit v1.2.3