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

Fixed check to see if block entity is in merge source.

Browse Source
This commit is contained in:
Lane Kolbly 2017-07-21 21:10:39 -05:00
parent 6e749dacd3
commit 6a261e451d
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 srcIdx = a_Src.MakeIndex(srcX, srcY, srcZ);
auto itrSrc = a_Src.m_BlockEntities->find(srcIdx); 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)}); m_BlockEntities->insert({idx, itrSrc->second->Clone(x, y, z)});
continue; continue;