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

Merge pull request #3553 from cuberite/RemoveChunkQueuedAssert

Browse Source 
Removed asserts about chunk queued.
This commit is contained in:
Mattes D 2017-01-19 16:44:44 +01:00 committed by GitHub
commit 35ca578f44
3 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Chunk.cpp
View File

@ -317,7 +317,6 @@ void cChunk::SetAllData(cSetChunkData & a_SetChunkData)
{ {
ASSERT(a_SetChunkData.IsHeightMapValid()); ASSERT(a_SetChunkData.IsHeightMapValid());
ASSERT(a_SetChunkData.AreBiomesValid()); ASSERT(a_SetChunkData.AreBiomesValid());
ASSERT(IsQueued());
memcpy(m_BiomeMap, a_SetChunkData.GetBiomes(), sizeof(m_BiomeMap)); memcpy(m_BiomeMap, a_SetChunkData.GetBiomes(), sizeof(m_BiomeMap));
memcpy(m_HeightMap, a_SetChunkData.GetHeightMap(), sizeof(m_HeightMap)); memcpy(m_HeightMap, a_SetChunkData.GetHeightMap(), sizeof(m_HeightMap));

1
src/Generating/ChunkGenerator.cpp
View File

@ -288,7 +288,6 @@ void cChunkGenerator::DoGenerate(int a_ChunkX, int a_ChunkZ)
{ {
ASSERT(m_PluginInterface != nullptr); ASSERT(m_PluginInterface != nullptr);
ASSERT(m_ChunkSink != nullptr); ASSERT(m_ChunkSink != nullptr);
ASSERT(m_ChunkSink->IsChunkQueued(a_ChunkX, a_ChunkZ));
cChunkDesc ChunkDesc(a_ChunkX, a_ChunkZ); cChunkDesc ChunkDesc(a_ChunkX, a_ChunkZ);
m_PluginInterface->CallHookChunkGenerating(ChunkDesc); m_PluginInterface->CallHookChunkGenerating(ChunkDesc);

2
src/World.cpp
View File

@ -2865,8 +2865,6 @@ void cWorld::MarkChunkSaved (int a_ChunkX, int a_ChunkZ)
void cWorld::QueueSetChunkData(const cSetChunkDataPtr & a_SetChunkData) void cWorld::QueueSetChunkData(const cSetChunkDataPtr & a_SetChunkData)
{ {
ASSERT(IsChunkQueued(a_SetChunkData->GetChunkX(), a_SetChunkData->GetChunkZ()));
// Validate biomes, if needed: // Validate biomes, if needed:
if (!a_SetChunkData->AreBiomesValid()) if (!a_SetChunkData->AreBiomesValid())
{ {