summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2017-07-22 14:33:02 +0200
committerGitHub <noreply@github.com>2017-07-22 14:33:02 +0200
commit51c6606fd45f8871e866b0380751809991769a61 (patch)
tree78b0b52ffc87f07b30f2a6d167013c005a5dce1a /src
parentIncrement fire block iterator (diff)
parentFixed check to see if block entity is in merge source. (diff)
downloadcuberite-51c6606fd45f8871e866b0380751809991769a61.tar
cuberite-51c6606fd45f8871e866b0380751809991769a61.tar.gz
cuberite-51c6606fd45f8871e866b0380751809991769a61.tar.bz2
cuberite-51c6606fd45f8871e866b0380751809991769a61.tar.lz
cuberite-51c6606fd45f8871e866b0380751809991769a61.tar.xz
cuberite-51c6606fd45f8871e866b0380751809991769a61.tar.zst
cuberite-51c6606fd45f8871e866b0380751809991769a61.zip
Diffstat (limited to 'src')
-rw-r--r--src/BlockArea.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp
index a17e5e8ef..eb3e82108 100644
--- a/src/BlockArea.cpp
+++ b/src/BlockArea.cpp
@@ -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;