From 47b9f6d941a1a1e595834f8a95defc74f3e363f3 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Mon, 1 Apr 2013 18:24:05 +0000 Subject: Hotfix for FS #347. This is not meant to be a permanent solution, but should provide insight into why the issue happens. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1347 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/World.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/source/World.cpp b/source/World.cpp index 3f5e604bf..a573653d7 100644 --- a/source/World.cpp +++ b/source/World.cpp @@ -1599,13 +1599,19 @@ void cWorld::SetChunkData( m_Generator.GenerateBiomes(a_ChunkX, a_ChunkZ, BiomeMap); } - m_ChunkMap->SetChunkData( - a_ChunkX, a_ChunkY, a_ChunkZ, - a_BlockTypes, a_BlockMeta, a_BlockLight, a_BlockSkyLight, - a_HeightMap, *Biomes, - a_Entities, a_BlockEntities, - a_MarkDirty - ); + { + // _X: 2013_04_01: Hotfix for FS #347 - deadlock between the anvil loader thread and the tick thread + // By locking the entities here, we break one of the 3 conditions needed for the deadlock + cCSLock Lock(m_CSEntities); + + m_ChunkMap->SetChunkData( + a_ChunkX, a_ChunkY, a_ChunkZ, + a_BlockTypes, a_BlockMeta, a_BlockLight, a_BlockSkyLight, + a_HeightMap, *Biomes, + a_Entities, a_BlockEntities, + a_MarkDirty + ); + } // If a client is requesting this chunk, send it to them: if (m_ChunkMap->HasChunkAnyClients(a_ChunkX, a_ChunkY, a_ChunkZ)) -- cgit v1.2.3