From a4955dfda3fd753f65bef9c98c8aa77b36db1edd Mon Sep 17 00:00:00 2001 From: Mattes D Date: Thu, 19 Jan 2017 16:25:07 +0100 Subject: [PATCH] Removed asserts about chunk queued. The assumption is not needed and was invalid under a stress-test. --- src/Chunk.cpp | 1 - src/Generating/ChunkGenerator.cpp | 1 - src/World.cpp | 2 -- 3 files changed, 4 deletions(-) diff --git a/src/Chunk.cpp b/src/Chunk.cpp index f1fd5d950..c196c3fe5 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -317,7 +317,6 @@ void cChunk::SetAllData(cSetChunkData & a_SetChunkData) { ASSERT(a_SetChunkData.IsHeightMapValid()); ASSERT(a_SetChunkData.AreBiomesValid()); - ASSERT(IsQueued()); memcpy(m_BiomeMap, a_SetChunkData.GetBiomes(), sizeof(m_BiomeMap)); memcpy(m_HeightMap, a_SetChunkData.GetHeightMap(), sizeof(m_HeightMap)); diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp index e7c2e4125..0bbd63f82 100644 --- a/src/Generating/ChunkGenerator.cpp +++ b/src/Generating/ChunkGenerator.cpp @@ -288,7 +288,6 @@ void cChunkGenerator::DoGenerate(int a_ChunkX, int a_ChunkZ) { ASSERT(m_PluginInterface != nullptr); ASSERT(m_ChunkSink != nullptr); - ASSERT(m_ChunkSink->IsChunkQueued(a_ChunkX, a_ChunkZ)); cChunkDesc ChunkDesc(a_ChunkX, a_ChunkZ); m_PluginInterface->CallHookChunkGenerating(ChunkDesc); diff --git a/src/World.cpp b/src/World.cpp index d9384b8a3..23ca384f1 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -2865,8 +2865,6 @@ 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()) {