summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorMasy98 <masy@antheruscraft.de>2014-09-06 22:03:35 +0200
committerMasy98 <masy@antheruscraft.de>2014-09-06 22:03:35 +0200
commit029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e (patch)
treedd6dce68bf9f1951f6aa663ebc7b4ff3cec38172 /src/World.cpp
parentMerge remote-tracking branch 'upstream/master' (diff)
parentMerge pull request #1385 from mc-server/clangWarnings (diff)
downloadcuberite-029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e.tar
cuberite-029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e.tar.gz
cuberite-029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e.tar.bz2
cuberite-029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e.tar.lz
cuberite-029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e.tar.xz
cuberite-029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e.tar.zst
cuberite-029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e.zip
Diffstat (limited to 'src/World.cpp')
-rw-r--r--src/World.cpp38
1 files changed, 20 insertions, 18 deletions
diff --git a/src/World.cpp b/src/World.cpp
index 2a3336dee..e669f6fa0 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -2374,6 +2374,8 @@ void cWorld::MarkChunkSaved (int a_ChunkX, int a_ChunkZ)
void cWorld::QueueSetChunkData(const cSetChunkDataPtr & a_SetChunkData)
{
+ ASSERT(IsChunkQueued(a_SetChunkData->GetChunkX(), a_SetChunkData->GetChunkZ()));
+
// Validate biomes, if needed:
if (!a_SetChunkData->AreBiomesValid())
{
@@ -2463,6 +2465,15 @@ bool cWorld::GetChunkBlockTypes(int a_ChunkX, int a_ChunkZ, BLOCKTYPE * a_BlockT
+bool cWorld::IsChunkQueued(int a_ChunkX, int a_ChunkZ) const
+{
+ return m_ChunkMap->IsChunkQueued(a_ChunkX, a_ChunkZ);
+}
+
+
+
+
+
bool cWorld::IsChunkValid(int a_ChunkX, int a_ChunkZ) const
{
return m_ChunkMap->IsChunkValid(a_ChunkX, a_ChunkZ);
@@ -2787,24 +2798,6 @@ void cWorld::TouchChunk(int a_ChunkX, int a_ChunkZ)
-bool cWorld::LoadChunk(int a_ChunkX, int a_ChunkZ)
-{
- return m_ChunkMap->LoadChunk(a_ChunkX, a_ChunkZ);
-}
-
-
-
-
-
-void cWorld::LoadChunks(const cChunkCoordsList & a_Chunks)
-{
- m_ChunkMap->LoadChunks(a_Chunks);
-}
-
-
-
-
-
void cWorld::ChunkLoadFailed(int a_ChunkX, int a_ChunkZ)
{
m_ChunkMap->ChunkLoadFailed(a_ChunkX, a_ChunkZ);
@@ -3520,6 +3513,15 @@ bool cWorld::cChunkGeneratorCallbacks::IsChunkValid(int a_ChunkX, int a_ChunkZ)
+bool cWorld::cChunkGeneratorCallbacks::IsChunkQueued(int a_ChunkX, int a_ChunkZ)
+{
+ return m_World->IsChunkQueued(a_ChunkX, a_ChunkZ);
+}
+
+
+
+
+
bool cWorld::cChunkGeneratorCallbacks::HasChunkAnyClients(int a_ChunkX, int a_ChunkZ)
{
return m_World->HasChunkAnyClients(a_ChunkX, a_ChunkZ);