Planet: Add missing locks

Author: SirLynix

include/CommonLib/Planet.hpp

@@ -84,6 +84,7 @@ namespace tsom
 			std::mutex m_chunkLayerAddedSignalMutex;
 			std::mutex m_chunkLayerRemovedSignalMutex;
 			std::mutex m_chunkUpdatedSignalMutex;
+			std::mutex m_chunkMutex;
 			tsl::hopscotch_map<ChunkIndices, ChunkData> m_chunks;
 			Nz::ThreadLocalData<ScriptingContext> m_scriptingContexts;
 			Nz::ApplicationBase& m_app;

src/CommonLib/Planet.cpp

@@ -49,6 +49,7 @@ namespace tsom
 		chunkData.onReset.Connect(chunkData.chunk->OnReset, [this, &blockLibrary](Chunk* chunk)
 		{
 			// Build direction blockers
+			std::unique_lock chunkLock(m_chunkMutex);
 			auto chunkIt = m_chunks.find(chunk->GetIndices());
 			NazaraAssert(chunkIt != m_chunks.end());
 			ChunkData& chunkData = chunkIt.value();
@@ -198,6 +199,8 @@ namespace tsom
 
 				if (previousBlockData.isTransparent != newBlockData.isTransparent)
 				{
+					std::unique_lock chunkLock(m_chunkMutex);
+
 					auto chunkIt = m_chunks.find(chunk->GetIndices());
 					NazaraAssert(chunkIt != m_chunks.end());
 					ChunkData& chunkData = chunkIt.value();
@@ -239,8 +242,12 @@ namespace tsom
 			OnChunkUpdated(this, chunk, neighborMask, layerMask);
 		});
 
+		std::unique_lock chunkLock(m_chunkMutex);
+
 		auto it = m_chunks.insert_or_assign(indices, std::move(chunkData)).first;
 
+		chunkLock.unlock();
+
 		if (initCallback)
 			it->second.chunk->Reset(initCallback);
 

src/ServerLib/ServerPlanetEnvironment.cpp

@@ -65,6 +65,8 @@ namespace tsom
 		GetPlanet().OnChunkVisibilityMaskUpdated.Connect([chunkLoadingData = m_chunkLoadingData](Planet* /*planet*/, Chunk* chunk, DirectionMask oldVisibilityMask, DirectionMask newVisibilityMask)
 		{
 			DirectionMask newDirectionMask = newVisibilityMask & ~oldVisibilityMask;
+
+			std::unique_lock lock(chunkLoadingData->mutex);
 			chunkLoadingData->visitedChunks[chunk->GetIndices()] = true;
 			chunkLoadingData->HandleChunkLoaded(chunk->GetIndices(), newDirectionMask);
 		});
@@ -275,6 +277,8 @@ namespace tsom
 				chunkLoadingData->planet->GenerateChunk(*chunk, seed, chunkCount, generatorName);
 
 			DirectionMask visibilityMask = chunkLoadingData->planet->GetChunkVisibilityMask(chunk->GetIndices());
+
+			std::unique_lock lock(chunkLoadingData->mutex);
 			chunkLoadingData->HandleChunkLoaded(chunk->GetIndices(), visibilityMask);
 
 			if (--chunkLoadingData->chunkLoadingCount == 0 && chunkLoadingData->remainingChunks.empty())
@@ -360,8 +364,6 @@ namespace tsom
 		ChunkIndices minIndices(-int(chunkCount.x / 2), -int(chunkCount.y / 2), -int(chunkCount.z / 2));
 		ChunkIndices maxIndices = minIndices + ChunkIndices(chunkCount) - ChunkIndices(1);
 
-		std::unique_lock lock(mutex);
-
 		// Direct neighbor can trigger indirect neighbor
 		bool isPrimaryChunk = Nz::Retrieve(visitedChunks, chunkIndices);