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

Merge branch 'master' into chunksparsing/structs

Browse Source 
Conflicts:
	src/Chunk.h
This commit is contained in:
Tycho
2014-05-10 05:05:44 -07:00
parent 77395b3739 a38d8b6513
commit d478e3cfb1
105 changed files with 2020 additions and 958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/LightingThread.cpp
View File

@@ -103,11 +103,13 @@ void cLightingThread::Stop(void)
cCSLock Lock(m_CS);
for (cChunkStays::iterator itr = m_PendingQueue.begin(), end = m_PendingQueue.end(); itr != end; ++itr)
{
(*itr)->Disable();
delete *itr;
}
m_PendingQueue.clear();
for (cChunkStays::iterator itr = m_Queue.begin(), end = m_Queue.end(); itr != end; ++itr)
{
(*itr)->Disable();
delete *itr;
}
m_Queue.clear();