flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

cChunkDesc::GetBlockEntity() re-creates block entity when blocktype doesn't match.

Browse Source
This commit is contained in:
madmaxoft 2013-11-15 11:33:24 +01:00
parent 5eb67dbdfc
commit ee1ac65e54
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/Generating/ChunkDesc.cpp
View File

@ -535,7 +535,14 @@ cBlockEntity * cChunkDesc::GetBlockEntity(int a_RelX, int a_RelY, int a_RelZ)
{ {
if (((*itr)->GetPosX() == AbsX) && ((*itr)->GetPosY() == a_RelY) && ((*itr)->GetPosZ() == AbsZ)) if (((*itr)->GetPosX() == AbsX) && ((*itr)->GetPosY() == a_RelY) && ((*itr)->GetPosZ() == AbsZ))
{ {
// Already in the list, return it: // 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 *itr;
} }
} // for itr - m_BlockEntities[] } // for itr - m_BlockEntities[]