diff options
Diffstat (limited to '')
| -rw-r--r-- | src/Generating/ChunkDesc.cpp | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/Generating/ChunkDesc.cpp b/src/Generating/ChunkDesc.cpp index 6ba63d5ce..630a3913c 100644 --- a/src/Generating/ChunkDesc.cpp +++ b/src/Generating/ChunkDesc.cpp @@ -573,23 +573,27 @@ void cChunkDesc::RandomFillRelCuboid( cBlockEntity * cChunkDesc::GetBlockEntity(int a_RelX, int a_RelY, int a_RelZ) { - int AbsX = a_RelX + m_ChunkX * cChunkDef::Width; - int AbsZ = a_RelZ + m_ChunkZ * cChunkDef::Width; - for (cBlockEntityList::iterator itr = m_BlockEntities.begin(), end = m_BlockEntities.end(); itr != end; ++itr) + auto Idx = cChunkDef::MakeIndex(a_RelX, a_RelY, a_RelZ); + auto itr = m_BlockEntities.find(Idx); + + if (itr != m_BlockEntities.end()) { - if (((*itr)->GetPosX() == AbsX) && ((*itr)->GetPosY() == a_RelY) && ((*itr)->GetPosZ() == AbsZ)) + // Already in the list: + cBlockEntity * BlockEntity = itr->second; + if (BlockEntity->GetBlockType() == GetBlockType(a_RelX, a_RelY, a_RelZ)) { - // Already in the list: - if ((*itr)->GetBlockType() != GetBlockType(a_RelX, a_RelY, a_RelZ)) - { - // Wrong type, the block type has been overwritten. Erase and create new: - m_BlockEntities.erase(itr); - break; - } // Correct type, already present. Return it: - return *itr; + return BlockEntity; } - } // for itr - m_BlockEntities[] + else + { + // Wrong type, the block type has been overwritten. Erase and create new: + m_BlockEntities.erase(itr); + } + } + + int AbsX = a_RelX + m_ChunkX * cChunkDef::Width; + int AbsZ = a_RelZ + m_ChunkZ * cChunkDef::Width; // The block entity is not created yet, try to create it and add to list: cBlockEntity * be = cBlockEntity::CreateByBlockType(GetBlockType(a_RelX, a_RelY, a_RelZ), GetBlockMeta(a_RelX, a_RelY, a_RelZ), AbsX, a_RelY, AbsZ); @@ -598,7 +602,7 @@ cBlockEntity * cChunkDesc::GetBlockEntity(int a_RelX, int a_RelY, int a_RelZ) // No block entity for this block type return nullptr; } - m_BlockEntities.push_back(be); + m_BlockEntities.insert({ Idx, be }); return be; } |