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

Avoid a gratuitous dirty when loading chunks with entities

Browse Source 
Loaded entities are directly moved into the chunk data, instead of having to go through cWorld, as if they were just spawned. This avoid dirtying the chunk.
This commit is contained in:
Tiger Wang
2020-12-24 15:27:44 +00:00
parent 7f894b2f73
commit 9fcd2d4210
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/World.cpp
View File

@@ -2310,13 +2310,6 @@ void cWorld::SetChunkData(cSetChunkData & a_SetChunkData)
m_ChunkMap.SetChunkData(a_SetChunkData);
// Initialize the entities (outside the m_ChunkMap's CS, to fix FS #347):
for (auto & Entity : a_SetChunkData.GetEntities())
{
auto EntityPtr = Entity.get();
EntityPtr->Initialize(std::move(Entity), *this);
}
// If a client is requesting this chunk, send it to them:
int ChunkX = a_SetChunkData.GetChunkX();
int ChunkZ = a_SetChunkData.GetChunkZ();
@@ -2337,14 +2330,6 @@ void cWorld::SetChunkData(cSetChunkData & a_SetChunkData)
return true;
}
);
// Save the chunk right after generating, so that we don't have to generate it again on next run
// If saving is disabled, then the chunk was marked dirty so it will get
// saved if saving is later enabled.
if (a_SetChunkData.ShouldMarkDirty() && IsSavingEnabled())
{
m_Storage.QueueSaveChunk(ChunkX, ChunkZ);
}
}