summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities/ChestEntity.cpp
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-09-11 23:20:49 +0200
committerMattes D <github@xoft.cz>2017-09-11 23:20:49 +0200
commite225b7f8262df48ad4d7094bc295add3007b0649 (patch)
treea42e9afcc88cfe6e9d1258458e3ad42764083d0e /src/BlockEntities/ChestEntity.cpp
parentcBlockArea: change MakeIndex to return size_t (diff)
downloadcuberite-e225b7f8262df48ad4d7094bc295add3007b0649.tar
cuberite-e225b7f8262df48ad4d7094bc295add3007b0649.tar.gz
cuberite-e225b7f8262df48ad4d7094bc295add3007b0649.tar.bz2
cuberite-e225b7f8262df48ad4d7094bc295add3007b0649.tar.lz
cuberite-e225b7f8262df48ad4d7094bc295add3007b0649.tar.xz
cuberite-e225b7f8262df48ad4d7094bc295add3007b0649.tar.zst
cuberite-e225b7f8262df48ad4d7094bc295add3007b0649.zip
Diffstat (limited to '')
-rw-r--r--src/BlockEntities/ChestEntity.cpp28
1 files changed, 6 insertions, 22 deletions
diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp
index a8f5b7242..5e8b29a45 100644
--- a/src/BlockEntities/ChestEntity.cpp
+++ b/src/BlockEntities/ChestEntity.cpp
@@ -138,33 +138,18 @@ bool cChestEntity::UsedBy(cPlayer * a_Player)
void cChestEntity::ScanNeighbours()
{
// Callback for finding neighbouring chest:
- class cFindNeighbour :
- public cChestCallback
+ auto FindNeighbour = [this](cChestEntity & a_Chest)
{
- public:
- cChestEntity * m_Neighbour;
- BLOCKTYPE m_ChestType;
-
- cFindNeighbour(BLOCKTYPE a_ChestType) :
- m_Neighbour(nullptr),
- m_ChestType(a_ChestType)
+ if (a_Chest.GetBlockType() != m_BlockType)
{
+ // Neighboring block is not the same type of chest
+ return true;
}
-
- 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;
- }
+ m_Neighbour = &a_Chest;
+ return false;
};
// 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) ||
@@ -172,7 +157,6 @@ void cChestEntity::ScanNeighbours()
m_World->DoWithChestAt(m_PosX, m_PosY, m_PosZ + 1, FindNeighbour)
)
{
- m_Neighbour = FindNeighbour.m_Neighbour;
m_Neighbour->m_Neighbour = this;
// Force neighbour's window shut. Does Mojang server do this or should a double window open?
m_Neighbour->DestroyWindow();