From 36be4a89f8bedca7a7b369289562cf71041a3db6 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Sat, 3 Jun 2017 20:17:53 +0100 Subject: Fixed double chests (#3741) Normal and trapped chests next to each other don't open a double chest window. Slot changes in the secondary chest are broadcast. Placing a chest in +x of another updates the original chest's metadata. --- src/BlockEntities/ChestEntity.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src/BlockEntities/ChestEntity.cpp') diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp index 3fcf1b386..a47593108 100644 --- a/src/BlockEntities/ChestEntity.cpp +++ b/src/BlockEntities/ChestEntity.cpp @@ -127,21 +127,28 @@ void cChestEntity::ScanNeighbours() { public: cChestEntity * m_Neighbour; + BLOCKTYPE m_ChestType; - cFindNeighbour() : - m_Neighbour(nullptr) + cFindNeighbour(BLOCKTYPE a_ChestType) : + m_Neighbour(nullptr), + m_ChestType(a_ChestType) { } virtual bool Item(cChestEntity * a_Chest) override { + if (a_Chest->GetBlockType() != m_ChestType) + { + // Neighboring block is not the same type of chest + return true; + } m_Neighbour = a_Chest; return false; } }; - // Scan horizontally adjacent blocks for any neighbouring chest: - cFindNeighbour FindNeighbour; + // Scan horizontally adjacent blocks for any neighbouring chest of the same type: + cFindNeighbour FindNeighbour(m_BlockType); if ( m_World->DoWithChestAt(m_PosX - 1, m_PosY, m_PosZ, FindNeighbour) || m_World->DoWithChestAt(m_PosX + 1, m_PosY, m_PosZ, FindNeighbour) || -- cgit v1.2.3