summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2017-01-19 16:44:44 +0100
committerGitHub <noreply@github.com>2017-01-19 16:44:44 +0100
commit35ca578f44683d2527da1097b7311ff53b22f89c (patch)
tree22c515b3b39193e39f240f0b98a469c005a82a06
parentMerge pull request #3551 from cuberite/RenameTwoLocks (diff)
parentRemoved asserts about chunk queued. (diff)
downloadcuberite-35ca578f44683d2527da1097b7311ff53b22f89c.tar
cuberite-35ca578f44683d2527da1097b7311ff53b22f89c.tar.gz
cuberite-35ca578f44683d2527da1097b7311ff53b22f89c.tar.bz2
cuberite-35ca578f44683d2527da1097b7311ff53b22f89c.tar.lz
cuberite-35ca578f44683d2527da1097b7311ff53b22f89c.tar.xz
cuberite-35ca578f44683d2527da1097b7311ff53b22f89c.tar.zst
cuberite-35ca578f44683d2527da1097b7311ff53b22f89c.zip
-rw-r--r--src/Chunk.cpp1
-rw-r--r--src/Generating/ChunkGenerator.cpp1
-rw-r--r--src/World.cpp2
3 files changed, 0 insertions, 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())
{