From 9da404ea2db52dd4a5d9d0a5ca1736fd7e2e10bf Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 4 Oct 2015 14:06:37 +0200 Subject: Fixed a race condition between chunk loader and generator. When using ChunkWorx to generate multiple chunks, the server would sometimes fail an assert because it would generate a chunk even when it was successfully loaded. This was caused by chunks queued in cWorld's m_SetChunkDataQueue and thus being marked as "InQueue" although they were already loaded. Solved by adding a new parameter to chunk coord callbacks specifying whether the operation succeeded or failed, and using that instead of the chunk presence flag to decide whether to generate or not. --- src/ChunkDef.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/ChunkDef.h') diff --git a/src/ChunkDef.h b/src/ChunkDef.h index f6c0381db..fcda9b5a6 100644 --- a/src/ChunkDef.h +++ b/src/ChunkDef.h @@ -464,7 +464,8 @@ public: virtual ~cChunkCoordCallback() {} - virtual void Call(int a_ChunkX, int a_ChunkZ) = 0; + /** Called with the chunk's coords, and an optional operation status flag for operations that support it. */ + virtual void Call(int a_ChunkX, int a_ChunkZ, bool a_IsSuccess) = 0; } ; -- cgit v1.2.3