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

cBlockArea: Fix performance regression (#4045)

This commit is contained in:
peterbell10 2017-09-23 17:47:46 +01:00 committed by Alexander Harkness
parent e883aa828c
commit 463fa48aec
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/BlockArea.cpp
View File

@ -835,7 +835,14 @@ void cBlockArea::Fill(int a_DataTypes, BLOCKTYPE a_BlockType, NIBBLETYPE a_Block
// If the area contains block entities, remove those not matching and replace with whatever block entity block was filled
if (HasBlockEntities() && ((a_DataTypes & baTypes) != 0))
{
RescanBlockEntities();
if (cBlockEntity::IsBlockEntityBlockType(a_BlockType))
{
RescanBlockEntities();
}
else
{
ClearBlockEntities(*m_BlockEntities);
}
}
}
@ -888,7 +895,14 @@ void cBlockArea::FillRelCuboid(int a_MinRelX, int a_MaxRelX, int a_MinRelY, int
// If the area contains block entities, remove those in the affected cuboid and replace with whatever block entity block was filled:
if (HasBlockEntities() && ((a_DataTypes & baTypes) != 0))
{
RescanBlockEntities();
if (cBlockEntity::IsBlockEntityBlockType(a_BlockType))
{
RescanBlockEntities();
}
else
{
ClearBlockEntities(*m_BlockEntities);
}
}
}