summaryrefslogtreecommitdiffstats
path: root/src/ChunkMap.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2020-12-21 16:51:43 +0100
committerTiger Wang <ziwei.tiger@outlook.com>2020-12-22 00:21:01 +0100
commit53ae358d8c5db448e7f4b6deac66b3d9e42e59ee (patch)
tree3a3224fdb45a684f9db573e1dedc5a25e5e5d8cb /src/ChunkMap.cpp
parentunique_ptr<cChunkMap> to plain member (diff)
downloadcuberite-53ae358d8c5db448e7f4b6deac66b3d9e42e59ee.tar
cuberite-53ae358d8c5db448e7f4b6deac66b3d9e42e59ee.tar.gz
cuberite-53ae358d8c5db448e7f4b6deac66b3d9e42e59ee.tar.bz2
cuberite-53ae358d8c5db448e7f4b6deac66b3d9e42e59ee.tar.lz
cuberite-53ae358d8c5db448e7f4b6deac66b3d9e42e59ee.tar.xz
cuberite-53ae358d8c5db448e7f4b6deac66b3d9e42e59ee.tar.zst
cuberite-53ae358d8c5db448e7f4b6deac66b3d9e42e59ee.zip
Diffstat (limited to 'src/ChunkMap.cpp')
-rw-r--r--src/ChunkMap.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index facfe8a31..4425ebb23 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -63,7 +63,7 @@ cChunk & cChunkMap::ConstructChunk(int a_ChunkX, int a_ChunkZ)
{
// If not exists insert. Then, return the chunk at these coordinates:
return m_Chunks.try_emplace(
- ChunkCoordinate{ a_ChunkX, a_ChunkZ },
+ { a_ChunkX, a_ChunkZ },
a_ChunkX, a_ChunkZ, this, m_World, *m_Pool
).first->second;
}
@@ -1548,7 +1548,7 @@ bool cChunkMap::ForEachLoadedChunk(cFunctionRef<bool(int, int)> a_Callback) cons
{
if (Chunk.second.IsValid())
{
- if (a_Callback(Chunk.first.ChunkX, Chunk.first.ChunkZ))
+ if (a_Callback(Chunk.first.m_ChunkX, Chunk.first.m_ChunkZ))
{
return false;
}
@@ -1729,11 +1729,11 @@ void cChunkMap::UnloadUnusedChunks(void)
{
if (
itr->second.CanUnload() && // Can unload
- !cPluginManager::Get()->CallHookChunkUnloading(*GetWorld(), itr->first.ChunkX, itr->first.ChunkZ) // Plugins agree
+ !cPluginManager::Get()->CallHookChunkUnloading(*GetWorld(), itr->first.m_ChunkX, itr->first.m_ChunkZ) // Plugins agree
)
{
// First notify plugins:
- cPluginManager::Get()->CallHookChunkUnloaded(*m_World, itr->first.ChunkX, itr->first.ChunkZ);
+ cPluginManager::Get()->CallHookChunkUnloaded(*m_World, itr->first.m_ChunkX, itr->first.m_ChunkZ);
// Notify entities within the chunk, while everything's still valid:
itr->second.OnUnload();
@@ -1759,7 +1759,7 @@ void cChunkMap::SaveAllChunks(void) const
{
if (Chunk.second.IsValid() && Chunk.second.IsDirty())
{
- GetWorld()->GetStorage().QueueSaveChunk(Chunk.first.ChunkX, Chunk.first.ChunkZ);
+ GetWorld()->GetStorage().QueueSaveChunk(Chunk.first.m_ChunkX, Chunk.first.m_ChunkZ);
}
}
}