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

Merge pull request #3866 from lkolbly/mergeBlockEntitiesFix

Browse Source 
Fixed check to see if block entity is in merge source.
This commit is contained in:
Tiger Wang 2017-07-22 13:33:02 +01:00 committed by GitHub
commit 51c6606fd4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BlockArea.cpp
View File

@ -2704,7 +2704,7 @@ void cBlockArea::MergeBlockEntities(int a_RelX, int a_RelY, int a_RelZ, const cB
{
auto srcIdx = a_Src.MakeIndex(srcX, srcY, srcZ);
auto itrSrc = a_Src.m_BlockEntities->find(srcIdx);
if (itrSrc == a_Src.m_BlockEntities->end())
if (itrSrc != a_Src.m_BlockEntities->end())
{
m_BlockEntities->insert({idx, itrSrc->second->Clone(x, y, z)});
continue;